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

Rename old tq methods that no longer need a unique name

Browse Source
r14.0.x
Timothy Pearson 13 years ago
parent 1f9d00360b
commit 2872359582
200 changed files with 1213 additions and 1213 deletions
Show Stats Download Patch File Download Diff File

20
kmymoney2/converter/convertertest.cpp
Unescape View File

@ -112,8 +112,8 @@ void ConverterTest::testWebQuotes()
CPPUNIT_ASSERT(qr.m_errors.count() == 0); CPPUNIT_ASSERT(qr.m_errors.count() == 0);
// Quote date should be within the last week, or something bad is going on. // 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::currentDate());
CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7));
// Quote value should at least be positive // Quote value should at least be positive
CPPUNIT_ASSERT(qr.m_price.isPositive()); 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; // 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_errors.count() == 0);
CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1)); CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1));
CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7));
CPPUNIT_ASSERT(qr.m_price.isPositive()); CPPUNIT_ASSERT(qr.m_price.isPositive());
q.launch("EUR > USD","Yahoo Currency"); 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; // 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_errors.count() == 0);
CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1)); CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1));
CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7));
CPPUNIT_ASSERT(qr.m_price.isPositive()); CPPUNIT_ASSERT(qr.m_price.isPositive());
q.launch("50492","Globe & Mail"); 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; // 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_errors.count() == 0);
CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1)); CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1));
CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7));
CPPUNIT_ASSERT(qr.m_price.isPositive()); CPPUNIT_ASSERT(qr.m_price.isPositive());
q.launch("TDB647","MSN.CA"); 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; // 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_errors.count() == 0);
CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1)); CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1));
CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7));
CPPUNIT_ASSERT(qr.m_price.isPositive()); CPPUNIT_ASSERT(qr.m_price.isPositive());
} }

12
kmymoney2/converter/mymoneygncreader.cpp
Unescape View File

@ -1192,10 +1192,10 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
acc.setDescription(gac->desc()); acc.setDescription(gac->desc());
TQDate tqcurrentDate = TQDate::tqcurrentDate(); TQDate currentDate = TQDate::currentDate();
acc.setOpeningDate(tqcurrentDate); acc.setOpeningDate(currentDate);
acc.setLastModified(tqcurrentDate); acc.setLastModified(currentDate);
acc.setLastReconciliationDate(tqcurrentDate); acc.setLastReconciliationDate(currentDate);
if (gac->commodity()->isCurrency()) { if (gac->commodity()->isCurrency()) {
acc.setCurrencyId (gac->commodity()->id().utf8()); acc.setCurrencyId (gac->commodity()->id().utf8());
m_currencyCount[gac->commodity()->id()]++; m_currencyCount[gac->commodity()->id()]++;
@ -1717,7 +1717,7 @@ void MyMoneyGncReader::convertSchedule (const GncSchedule *gsc) {
MyMoneyTransaction tx; MyMoneyTransaction tx;
m_suspectSchedule = false; m_suspectSchedule = false;
TQDate startDate, nextDate, lastDate, endDate; // for date calculations TQDate startDate, nextDate, lastDate, endDate; // for date calculations
TQDate today = TQDate::tqcurrentDate(); TQDate today = TQDate::currentDate();
int numOccurs, remOccurs; int numOccurs, remOccurs;
if (m_scheduleCount == 0) signalProgress (0, m_gncScheduleCount, i18n("Loading schedules...")); if (m_scheduleCount == 0) signalProgress (0, m_gncScheduleCount, i18n("Loading schedules..."));
@ -2139,7 +2139,7 @@ TQString MyMoneyGncReader::createOrphanAccount (const TQString& gncName) {
acc.setName ("orphan_" + gncName); acc.setName ("orphan_" + gncName);
acc.setDescription (i18n("Orphan created from unknown gnucash account")); acc.setDescription (i18n("Orphan created from unknown gnucash account"));
TQDate today = TQDate::tqcurrentDate(); TQDate today = TQDate::currentDate();
acc.setOpeningDate (today); acc.setOpeningDate (today);
acc.setLastModified (today); acc.setLastModified (today);

8
kmymoney2/converter/mymoneyqifreader.cpp
Unescape View File

@ -460,7 +460,7 @@ bool MyMoneyQifReader::finishImport(void)
// remove the Don't ask again entries // remove the Don't ask again entries
KConfig* config = KGlobal::config(); KConfig* config = KGlobal::config();
config->setGroup(TQString::tqfromLatin1("Notification Messages")); config->setGroup(TQString::fromLatin1("Notification Messages"));
TQStringList::ConstIterator it; TQStringList::ConstIterator it;
for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++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 // remove the Don't ask again entries
KConfig* config = KGlobal::config(); KConfig* config = KGlobal::config();
config->setGroup(TQString::tqfromLatin1("Notification Messages")); config->setGroup(TQString::fromLatin1("Notification Messages"));
TQStringList::ConstIterator it; TQStringList::ConstIterator it;
for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++it) { for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++it) {
@ -1058,7 +1058,7 @@ void MyMoneyQifReader::processTransactionEntry(void)
i18n("Invalid date format")); i18n("Invalid date format"));
switch(rc) { switch(rc) {
case KMessageBox::Continue: case KMessageBox::Continue:
tr.m_datePosted = (TQDate::tqcurrentDate()); tr.m_datePosted = (TQDate::currentDate());
break; break;
case KMessageBox::Cancel: case KMessageBox::Cancel:
@ -1305,7 +1305,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void)
i18n("Invalid date format")); i18n("Invalid date format"));
switch(rc) { switch(rc) {
case KMessageBox::Continue: case KMessageBox::Continue:
tr.m_datePosted = TQDate::tqcurrentDate(); tr.m_datePosted = TQDate::currentDate();
break; break;
case KMessageBox::Cancel: case KMessageBox::Cancel:

2
kmymoney2/converter/mymoneystatementreader.cpp
Unescape View File

@ -402,7 +402,7 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes
// remove the Don't ask again entries // remove the Don't ask again entries
KConfig* config = KGlobal::config(); KConfig* config = KGlobal::config();
config->setGroup(TQString::tqfromLatin1("Notification Messages")); config->setGroup(TQString::fromLatin1("Notification Messages"));
TQStringList::ConstIterator it; TQStringList::ConstIterator it;
for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++it) { for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++it) {

6
kmymoney2/converter/webpricequote.cpp
Unescape View File

@ -382,7 +382,7 @@ void WebPriceQuote::slotParseQuote(const TQString& _quotedata)
catch (MyMoneyException* e) catch (MyMoneyException* e)
{ {
// emit error(i18n("Unable to parse date %1 using format %2: %3").tqarg(datestr,dateparse.format(),e->what())); // emit error(i18n("Unable to parse date %1 using format %2: %3").tqarg(datestr,dateparse.format(),e->what()));
m_date = TQDate::tqcurrentDate(); m_date = TQDate::currentDate();
gotdate = true; gotdate = true;
delete e; delete e;
} }
@ -1016,7 +1016,7 @@ convertertest::QuoteReceiver::QuoteReceiver(WebPriceQuote* q, TQObject* parent,
connect(q,TQT_SIGNAL(quote(const TQString&,const TQDate&, const double&)), connect(q,TQT_SIGNAL(quote(const TQString&,const TQDate&, const double&)),
this,TQT_SLOT(slotGetQuote(const TQString&,const TQDate&, const double&))); this,TQT_SLOT(slotGetQuote(const TQString&,const TQDate&, const double&)));
connect(q,TQT_SIGNAL(status(const TQString&)), 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&)), connect(q,TQT_SIGNAL(error(const TQString&)),
this,TQT_SLOT(slotError(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_price = MyMoneyMoney(m);
m_date = d; m_date = d;
} }
void convertertest::QuoteReceiver::slottqStatus(const TQString& msg) void convertertest::QuoteReceiver::slotStatus(const TQString& msg)
{ {
// kdDebug(2) << "test::QuoteReceiver::slotStatus( " << msg << " )" << endl; // kdDebug(2) << "test::QuoteReceiver::slotStatus( " << msg << " )" << endl;

4
kmymoney2/converter/webpricequote.h
Unescape View File

@ -217,7 +217,7 @@ class MyMoneyDateFormat
public: public:
MyMoneyDateFormat(const TQString& _format): m_format(_format) {} MyMoneyDateFormat(const TQString& _format): m_format(_format) {}
TQString convertDate(const TQDate& _in) const; 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; } const TQString& format(void) const { return m_format; }
private: private:
TQString m_format; TQString m_format;
@ -239,7 +239,7 @@ public:
~QuoteReceiver(); ~QuoteReceiver();
public slots: public slots:
void slotGetQuote(const TQString&,const TQDate&, const double&); void slotGetQuote(const TQString&,const TQDate&, const double&);
void slottqStatus(const TQString&); void slotStatus(const TQString&);
void slotError(const TQString&); void slotError(const TQString&);
public: public:
TQStringList m_statuses; TQStringList m_statuses;

22
kmymoney2/dialogs/investtransactioneditor.cpp
Unescape View File

@ -279,39 +279,39 @@ void InvestTransactionEditor::createEditWidgets(void)
} }
TQLabel* label = new TQLabel("", 0); 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; m_editWidgets["total"] = label;
label = new TQLabel("", 0); label = new TQLabel("", 0);
label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["total-label"] = label; m_editWidgets["total-label"] = label;
label = new TQLabel("", 0); label = new TQLabel("", 0);
label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["asset-label"] = label; m_editWidgets["asset-label"] = label;
label = new TQLabel("", 0); label = new TQLabel("", 0);
label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["fee-label"] = label; m_editWidgets["fee-label"] = label;
label = new TQLabel("", 0); label = new TQLabel("", 0);
label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["fee-amount-label"] = label; m_editWidgets["fee-amount-label"] = label;
label = new TQLabel("", 0); label = new TQLabel("", 0);
label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["interest-label"] = label; m_editWidgets["interest-label"] = label;
label = new TQLabel("", 0); label = new TQLabel("", 0);
label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["interest-amount-label"] = label; m_editWidgets["interest-amount-label"] = label;
label = new TQLabel("", 0); label = new TQLabel("", 0);
label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["price-label"] = label; m_editWidgets["price-label"] = label;
label = new TQLabel("", 0); label = new TQLabel("", 0);
label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["shares-label"] = label; m_editWidgets["shares-label"] = label;
// if we don't have more than 1 selected transaction, we don't need // 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()) else if(m_lastPostDate.isValid())
postDate->setDate(m_lastPostDate); postDate->setDate(m_lastPostDate);
else else
postDate->setDate(TQDate::tqcurrentDate()); postDate->setDate(TQDate::currentDate());
// security (but only if it's not the investment account) // security (but only if it's not the investment account)
if(m_split.accountId() != m_account.id()) { if(m_split.accountId() != m_account.id()) {
@ -1014,7 +1014,7 @@ bool InvestTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyM
s0.setReconcileFlag(status->state()); s0.setReconcileFlag(status->state());
if(s0.reconcileFlag() == MyMoneySplit::Reconciled && !s0.reconcileDate().isValid()) 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 // 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); bool rc = d->m_activity->createTransaction(t, s0, assetAccountSplit, feeSplits, m_feeSplits, interestSplits, m_interestSplits, security, currency);

6
kmymoney2/dialogs/kaccountselectdlgdecl.ui
Unescape View File

@ -95,7 +95,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>110</width> <width>110</width>
<height>20</height> <height>20</height>
@ -127,7 +127,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -184,7 +184,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>160</width> <width>160</width>
<height>0</height> <height>0</height>

4
kmymoney2/dialogs/kbackupdlgdecl.ui
Unescape View File

@ -135,7 +135,7 @@ Click OK to perform the backup. If your system does not use an automounter, make
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>24</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>455</width> <width>455</width>
<height>0</height> <height>0</height>

4
kmymoney2/dialogs/kbalancechartdlg.cpp
Unescape View File

@ -83,7 +83,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare
reportCfg.addAccount(account.id()); reportCfg.addAccount(account.id());
reportCfg.setColumnsAreDays( true ); reportCfg.setColumnsAreDays( true );
reportCfg.setConvertCurrency( false ); 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); 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( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
connect( buttonClose, 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 ); clearWState( WState_Polished );
#endif #endif
} }

8
kmymoney2/dialogs/kcategoryreassigndlgdecl.ui
Unescape View File

@ -29,7 +29,7 @@
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>300</width> <width>300</width>
<height>0</height> <height>0</height>
@ -52,7 +52,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -82,7 +82,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -121,7 +121,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>305</width> <width>305</width>
<height>20</height> <height>20</height>

8
kmymoney2/dialogs/kchooseimportexportdlgdecl.ui
Unescape View File

@ -95,7 +95,7 @@ Once you have chosen an import type please press the OK button.</string>
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property> <property>
<name>tqsizeHint</name> <name>sizeHint</name>
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -132,7 +132,7 @@ Once you have chosen an import type please press the OK button.</string>
<cstring>typeCombo</cstring> <cstring>typeCombo</cstring>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>tqminimumSize</name> <name>minimumSize</name>
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -155,7 +155,7 @@ Once you have chosen an import type please press the OK button.</string>
</sizepolicy> </sizepolicy>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>tqminimumSize</name> <name>minimumSize</name>
<size> <size>
<width>410</width> <width>410</width>
<height>100</height> <height>100</height>
@ -195,7 +195,7 @@ Once you have chosen an import type please press the OK button.</string>
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property> <property>
<name>tqsizeHint</name> <name>sizeHint</name>
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui
Unescape View File

@ -109,7 +109,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>180</width> <width>180</width>
<height>16</height> <height>16</height>

8
kmymoney2/dialogs/kcsvprogressdlgdecl.ui
Unescape View File

@ -187,7 +187,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string
</sizepolicy> </sizepolicy>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>tqminimumSize</name> <name>minimumSize</name>
<size> <size>
<width>50</width> <width>50</width>
<height>0</height> <height>0</height>
@ -243,7 +243,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string
</sizepolicy> </sizepolicy>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>tqminimumSize</name> <name>minimumSize</name>
<size> <size>
<width>50</width> <width>50</width>
<height>0</height> <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> <enum>Expanding</enum>
</property> </property>
<property> <property>
<name>tqsizeHint</name> <name>sizeHint</name>
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -484,7 +484,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property> <property>
<name>tqsizeHint</name> <name>sizeHint</name>
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
kmymoney2/dialogs/kcurrencycalculator.cpp
Unescape View File

@ -125,7 +125,7 @@ KCurrencyCalculator::KCurrencyCalculator(const MyMoneySecurity& from, const MyMo
if(date.isValid()) if(date.isValid())
m_dateEdit->setDate(date); m_dateEdit->setDate(date);
else else
m_dateEdit->setDate(TQDate::tqcurrentDate()); m_dateEdit->setDate(TQDate::currentDate());
m_fromCurrencyText->setText(m_fromCurrency.isCurrency() ? m_fromCurrency.id() : m_fromCurrency.tradingSymbol()); m_fromCurrencyText->setText(m_fromCurrency.isCurrency() ? m_fromCurrency.id() : m_fromCurrency.tradingSymbol());
m_toCurrencyText->setText(m_toCurrency.isCurrency() ? m_toCurrency.id() : m_toCurrency.tradingSymbol()); m_toCurrencyText->setText(m_toCurrency.isCurrency() ? m_toCurrency.id() : m_toCurrency.tradingSymbol());

8
kmymoney2/dialogs/kcurrencycalculatordecl.ui
Unescape View File

@ -76,7 +76,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>20</height> <height>20</height>
@ -109,7 +109,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>145</width> <width>145</width>
<height>20</height> <height>20</height>
@ -329,7 +329,7 @@ xx</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -368,7 +368,7 @@ xx</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
kmymoney2/dialogs/kcurrencyeditdlgdecl.ui
Unescape View File

@ -78,7 +78,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>51</width> <width>51</width>
<height>21</height> <height>21</height>
@ -103,7 +103,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>31</height> <height>31</height>
@ -246,7 +246,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
kmymoney2/dialogs/keditequityentrydecl.ui
Unescape View File

@ -163,7 +163,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>21</height> <height>21</height>
@ -204,7 +204,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>21</height> <height>21</height>
@ -233,7 +233,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>238</width> <width>238</width>
<height>21</height> <height>21</height>

8
kmymoney2/dialogs/keditloanwizard.cpp
Unescape View File

@ -71,7 +71,7 @@ KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, TQWidget *parent
loadWidgets(m_account); loadWidgets(m_account);
if(m_account.openingDate() > TQDate::tqcurrentDate()) { if(m_account.openingDate() > TQDate::currentDate()) {
m_effectiveDateNoteLabel->setText(TQString("\n") + i18n( 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. " "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." "Please revisit this dialog when the time has come."
@ -123,10 +123,10 @@ void KEditLoanWizard::loadWidgets(const MyMoneyAccount& /* account */)
} }
MyMoneyMoney ir; MyMoneyMoney ir;
if(m_schedule.startDate() > TQDate::tqcurrentDate()) { if(m_schedule.startDate() > TQDate::currentDate()) {
ir = m_account.interestRate(m_schedule.startDate()); ir = m_account.interestRate(m_schedule.startDate());
} else { } else {
ir = m_account.interestRate(TQDate::tqcurrentDate()); ir = m_account.interestRate(TQDate::currentDate());
} }
m_interestRateEdit->loadText(ir.formatMoney("", 3)); m_interestRateEdit->loadText(ir.formatMoney("", 3));
m_newInterestRateEdit->loadText(ir.formatMoney("", 3)); m_newInterestRateEdit->loadText(ir.formatMoney("", 3));
@ -417,7 +417,7 @@ void KEditLoanWizard::slotCheckPageFinished(void)
if(currentPage() == m_effectiveDatePage) { if(currentPage() == m_effectiveDatePage) {
if(m_effectiveChangeDateEdit->date() < m_account.openingDate() if(m_effectiveChangeDateEdit->date() < m_account.openingDate()
|| m_effectiveChangeDateEdit->date() > TQDate::tqcurrentDate()) || m_effectiveChangeDateEdit->date() > TQDate::currentDate())
nextButton()->setEnabled(false); nextButton()->setEnabled(false);
} else if(currentPage() == m_interestEditPage) { } else if(currentPage() == m_interestEditPage) {

4
kmymoney2/dialogs/keditscheduledlg.cpp
Unescape View File

@ -165,7 +165,7 @@ KEditScheduleDlg::~KEditScheduleDlg()
void KEditScheduleDlg::slotSetupSize(void) void KEditScheduleDlg::slotSetupSize(void)
{ {
resize(width(), tqminimumSizeHint().height()); resize(width(), minimumSizeHint().height());
} }
TransactionEditor* KEditScheduleDlg::startEdit(void) TransactionEditor* KEditScheduleDlg::startEdit(void)
@ -393,7 +393,7 @@ bool KEditScheduleDlg::focusNextPrevChild(bool next)
TQWidget *w = 0; TQWidget *w = 0;
TQWidget *currentWidget; TQWidget *currentWidget;
w = tqApp->tqfocusWidget(); w = tqApp->focusWidget();
while(w && d->m_tabOrderWidgets.find(w) == -1) { while(w && d->m_tabOrderWidgets.find(w) == -1) {
// qDebug("'%s' not in list, use parent", w->className()); // qDebug("'%s' not in list, use parent", w->className());
w = w->parentWidget(); w = w->parentWidget();

10
kmymoney2/dialogs/keditscheduledlgdecl.ui
Unescape View File

@ -142,7 +142,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>21</height> <height>21</height>
@ -320,7 +320,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -372,7 +372,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -428,7 +428,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -467,7 +467,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>280</width> <width>280</width>
<height>0</height> <height>0</height>

4
kmymoney2/dialogs/kendingbalancedlg.cpp
Unescape View File

@ -70,7 +70,7 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *pa
MyMoneySecurity currency = MyMoneyFile::instance()->security(account.currencyId()); 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>.").tqarg(currency.name())+TQString("</qt>"));
m_statementDate->setDate(TQDate::tqcurrentDate()); m_statementDate->setDate(TQDate::currentDate());
// If the previous reconciliation was postponed, // If the previous reconciliation was postponed,
// we show a different first page // 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 // then take the last statement date and add one month and use that as statement
// date. // date.
TQDate lastStatementDate = account.lastReconciliationDate(); TQDate lastStatementDate = account.lastReconciliationDate();
if(lastStatementDate.addMonths(1) < TQDate::tqcurrentDate()) { if(lastStatementDate.addMonths(1) < TQDate::currentDate()) {
m_statementDate->setDate(lastStatementDate.addMonths(1)); m_statementDate->setDate(lastStatementDate.addMonths(1));
} }

32
kmymoney2/dialogs/kendingbalancedlgdecl.ui
Unescape View File

@ -89,7 +89,7 @@ Please enter the following information found on your statement:</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>19</height> <height>19</height>
@ -120,7 +120,7 @@ Please enter the following information found on your statement:</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>42</width> <width>42</width>
<height>0</height> <height>0</height>
@ -179,7 +179,7 @@ Please enter the following information found on your statement:</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>44</width> <width>44</width>
<height>0</height> <height>0</height>
@ -198,7 +198,7 @@ Please enter the following information found on your statement:</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -259,7 +259,7 @@ Please enter the following information found on your statement:</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>51</width> <width>51</width>
<height>0</height> <height>0</height>
@ -318,7 +318,7 @@ Please enter the following information found on your statement:</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>71</width> <width>71</width>
<height>0</height> <height>0</height>
@ -348,7 +348,7 @@ Please enter the following information found on your statement:</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>19</height> <height>19</height>
@ -475,7 +475,7 @@ Please enter the following information found on your statement:</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>25</height> <height>25</height>
@ -547,7 +547,7 @@ All information you have entered into this wizard will be shown and all transact
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>50</height> <height>50</height>
@ -578,7 +578,7 @@ All information you have entered into this wizard will be shown and all transact
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>42</width> <width>42</width>
<height>0</height> <height>0</height>
@ -650,7 +650,7 @@ All information you have entered into this wizard will be shown and all transact
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>46</width> <width>46</width>
<height>0</height> <height>0</height>
@ -669,7 +669,7 @@ All information you have entered into this wizard will be shown and all transact
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>87</height> <height>87</height>
@ -729,7 +729,7 @@ All information you have entered into this wizard will be shown and all transact
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>16</height> <height>16</height>
@ -754,7 +754,7 @@ All information you have entered into this wizard will be shown and all transact
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>60</width> <width>60</width>
<height>20</height> <height>20</height>
@ -924,7 +924,7 @@ All information you have entered into this wizard will be shown and all transact
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>60</width> <width>60</width>
<height>20</height> <height>20</height>
@ -943,7 +943,7 @@ All information you have entered into this wizard will be shown and all transact
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>16</height> <height>16</height>

12
kmymoney2/dialogs/kenterscheduledlg.cpp
Unescape View File

@ -175,7 +175,7 @@ void KEnterScheduleDlg::resizeEvent(TQResizeEvent* ev)
void KEnterScheduleDlg::slotSetupSize(void) void KEnterScheduleDlg::slotSetupSize(void)
{ {
resize(width(), tqminimumSizeHint().height()); resize(width(), minimumSizeHint().height());
} }
int KEnterScheduleDlg::exec(void) 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 // 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 // If not, set the focus to the first widget in the tab order
TQWidget* tqfocusWidget = editor->firstWidget(); TQWidget* focusWidget = editor->firstWidget();
if(!tqfocusWidget) if(!focusWidget)
tqfocusWidget = d->m_tabOrderWidgets.first(); focusWidget = d->m_tabOrderWidgets.first();
tqfocusWidget->setFocus(); focusWidget->setFocus();
// Make sure, we use the adjusted date // Make sure, we use the adjusted date
kMyMoneyDateInput* dateEdit = dynamic_cast<kMyMoneyDateInput*>(editor->haveWidget("postdate")); kMyMoneyDateInput* dateEdit = dynamic_cast<kMyMoneyDateInput*>(editor->haveWidget("postdate"));
@ -289,7 +289,7 @@ bool KEnterScheduleDlg::focusNextPrevChild(bool next)
TQWidget *w = 0; TQWidget *w = 0;
TQWidget *currentWidget; TQWidget *currentWidget;
w = tqApp->tqfocusWidget(); w = tqApp->focusWidget();
while(w && d->m_tabOrderWidgets.find(w) == -1) { while(w && d->m_tabOrderWidgets.find(w) == -1) {
// qDebug("'%s' not in list, use parent", w->className()); // qDebug("'%s' not in list, use parent", w->className());
w = w->parentWidget(); w = w->parentWidget();

6
kmymoney2/dialogs/kenterscheduledlgdecl.ui
Unescape View File

@ -45,7 +45,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>70</width>
<height>0</height> <height>0</height>
@ -79,7 +79,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>70</width>
<height>0</height> <height>0</height>
@ -245,7 +245,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>190</width> <width>190</width>
<height>20</height> <height>20</height>

8
kmymoney2/dialogs/kequitypriceupdatedlg.cpp
Unescape View File

@ -104,7 +104,7 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(TQWidget *parent, const TQString& s
if ( file->security( pair.first ).isCurrency() && ( securityId.isEmpty() || ( pair == currencyIds ) ) ) if ( file->security( pair.first ).isCurrency() && ( securityId.isEmpty() || ( pair == currencyIds ) ) )
{ {
const MyMoneyPriceEntries& entries = (*it_price); 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); addPricePair(pair);
btnUpdateAll->setEnabled(true); btnUpdateAll->setEnabled(true);
} }
@ -282,7 +282,7 @@ void KEquityPriceUpdateDlg::logErrorMessage(const TQString& message)
void KEquityPriceUpdateDlg::logStatusMessage(const TQString& message) void KEquityPriceUpdateDlg::logStatusMessage(const TQString& message)
{ {
lbtqStatus->append(message); lbStatus->append(message);
} }
MyMoneyPrice KEquityPriceUpdateDlg::price(const TQString& id) const MyMoneyPrice KEquityPriceUpdateDlg::price(const TQString& id) const
@ -492,8 +492,8 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQStrin
if ( _price > 0.0f && _date.isValid() ) if ( _price > 0.0f && _date.isValid() )
{ {
TQDate date = _date; TQDate date = _date;
if ( date > TQDate::tqcurrentDate() ) if ( date > TQDate::currentDate() )
date = TQDate::tqcurrentDate(); date = TQDate::currentDate();
double price = _price; double price = _price;
TQString id = _id.utf8(); TQString id = _id.utf8();

10
kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui
Unescape View File

@ -24,7 +24,7 @@
<property name="name"> <property name="name">
<cstring>lvEquityList</cstring> <cstring>lvEquityList</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>350</width> <width>350</width>
<height>0</height> <height>0</height>
@ -75,7 +75,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -105,12 +105,12 @@
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>tqStatus:</string> <string>Status:</string>
</property> </property>
</widget> </widget>
<widget class="KTextEdit"> <widget class="KTextEdit">
<property name="name"> <property name="name">
<cstring>lbtqStatus</cstring> <cstring>lbStatus</cstring>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>LogText</enum> <enum>LogText</enum>
@ -139,7 +139,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>91</width> <width>91</width>
<height>20</height> <height>20</height>

10
kmymoney2/dialogs/kexportdlgdecl.ui
Unescape View File

@ -209,7 +209,7 @@ You can choose the file's path, the account and the format of the QIF file (prof
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>0</height> <height>0</height>
@ -318,7 +318,7 @@ You can choose the file's path, the account and the format of the QIF file (prof
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>50</width> <width>50</width>
<height>0</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>50</width> <width>50</width>
<height>0</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>230</width> <width>230</width>
<height>16</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>451</width> <width>451</width>
<height>0</height> <height>0</height>

30
kmymoney2/dialogs/kfindtransactiondlgdecl.ui
Unescape View File

@ -84,7 +84,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>83</height> <height>83</height>
@ -103,7 +103,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>300</width> <width>300</width>
<height>0</height> <height>0</height>
@ -247,7 +247,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -266,7 +266,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>
@ -344,7 +344,7 @@
<property name="name"> <property name="name">
<cstring>m_amountToEdit</cstring> <cstring>m_amountToEdit</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -372,7 +372,7 @@
<property name="name"> <property name="name">
<cstring>m_amountEdit</cstring> <cstring>m_amountEdit</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -392,7 +392,7 @@
<property name="name"> <property name="name">
<cstring>m_amountFromEdit</cstring> <cstring>m_amountFromEdit</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -411,7 +411,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>16</height> <height>16</height>
@ -430,7 +430,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>75</height> <height>75</height>
@ -554,7 +554,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>42</height> <height>42</height>
@ -698,7 +698,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>130</width> <width>130</width>
<height>20</height> <height>20</height>
@ -816,7 +816,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -835,7 +835,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>16</height> <height>16</height>
@ -886,7 +886,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>24</height> <height>24</height>
@ -1008,7 +1008,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>51</width> <width>51</width>
<height>20</height> <height>20</height>

6
kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui
Unescape View File

@ -167,7 +167,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>140</width> <width>140</width>
<height>20</height> <height>20</height>
@ -254,7 +254,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -299,7 +299,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>200</width> <width>200</width>
<height>20</height> <height>20</height>

8
kmymoney2/dialogs/kgncpricesourcedlgdecl.ui
Unescape View File

@ -41,7 +41,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>91</width> <width>91</width>
<height>20</height> <height>20</height>
@ -66,7 +66,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>20</height> <height>20</height>
@ -94,7 +94,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>171</width> <width>171</width>
<height>20</height> <height>20</height>
@ -227,7 +227,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>370</height> <height>370</height>

4
kmymoney2/dialogs/kimportdlgdecl.ui
Unescape View File

@ -131,7 +131,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>0</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>411</width> <width>411</width>
<height>0</height> <height>0</height>

2
kmymoney2/dialogs/kloadtemplatedlgdecl.ui
Unescape View File

@ -53,7 +53,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>228</width> <width>228</width>
<height>20</height> <height>20</height>

4
kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui
Unescape View File

@ -252,7 +252,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -305,7 +305,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>120</width> <width>120</width>
<height>20</height> <height>20</height>

4
kmymoney2/dialogs/kmymoneypricedlgdecl.ui
Unescape View File

@ -100,7 +100,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>150</height> <height>150</height>
@ -151,7 +151,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>560</width> <width>560</width>
<height>20</height> <height>20</height>

10
kmymoney2/dialogs/kmymoneysplittable.cpp
Unescape View File

@ -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*/) void kMyMoneySplitTable::paintCell(TQPainter *p, int row, int col, const TQRect& r, bool /*selected*/)
{ {
TQColorGroup g = tqcolorGroup(); TQColorGroup g = colorGroup();
TQColor textColor; TQColor textColor;
g.setColor(TQColorGroup::Base, rowBackgroundColor(row)); g.setColor(TQColorGroup::Base, rowBackgroundColor(row));
@ -452,7 +452,7 @@ void kMyMoneySplitTable::contentsMouseDoubleClickEvent( TQMouseEvent *e )
break; break;
case 2: case 2:
editWidget = dynamic_cast<KLineEdit*> (m_editAmount->tqfocusWidget()); editWidget = dynamic_cast<KLineEdit*> (m_editAmount->focusWidget());
break; break;
default: default:
@ -493,7 +493,7 @@ void kMyMoneySplitTable::setNumRows(int irows)
#if 0 #if 0
// recalculate row height hint // recalculate row height hint
KMyMoneyCategory cat; KMyMoneyCategory cat;
height = TQMAX(cat.tqsizeHint().height(), height); height = TQMAX(cat.sizeHint().height(), height);
#endif #endif
verticalHeader()->setUpdatesEnabled(false); verticalHeader()->setUpdatesEnabled(false);
@ -568,7 +568,7 @@ void kMyMoneySplitTable::slotUpdateData(const MyMoneyTransaction& t)
unsigned width = fontMetrics().width(amountTxt); unsigned width = fontMetrics().width(amountTxt);
valfield->setMinimumWidth(width); valfield->setMinimumWidth(width);
width = valfield->tqminimumSizeHint().width(); width = valfield->minimumSizeHint().width();
if(width > m_amountWidth) if(width > m_amountWidth)
m_amountWidth = width; m_amountWidth = width;
@ -969,7 +969,7 @@ bool kMyMoneySplitTable::focusNextPrevChild(bool next)
TQWidget *w = 0; TQWidget *w = 0;
TQWidget *currentWidget; TQWidget *currentWidget;
m_tabOrderWidgets.find(tqApp->tqfocusWidget()); m_tabOrderWidgets.find(tqApp->focusWidget());
currentWidget = m_tabOrderWidgets.current(); currentWidget = m_tabOrderWidgets.current();
w = next ? m_tabOrderWidgets.next() : m_tabOrderWidgets.prev(); w = next ? m_tabOrderWidgets.next() : m_tabOrderWidgets.prev();

2
kmymoney2/dialogs/knewaccountdlg.cpp
Unescape View File

@ -289,7 +289,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo
} }
if(!m_account.openingDate().isValid()) if(!m_account.openingDate().isValid())
m_account.setOpeningDate(TQDate::tqcurrentDate()); m_account.setOpeningDate(TQDate::currentDate());
startDateEdit->setDate(m_account.openingDate()); startDateEdit->setDate(m_account.openingDate());
accountNoEdit->setText(account.number()); accountNoEdit->setText(account.number());

2
kmymoney2/dialogs/knewaccountdlg.h
Unescape View File

@ -118,7 +118,7 @@ public:
protected: protected:
void resizeEvent(TQResizeEvent* e); void resizeEvent(TQResizeEvent* e);
void displayOnlineBankingtqStatus(void); void displayOnlineBankingStatus(void);
void adjustEditWidgets(kMyMoneyEdit* dst, kMyMoneyEdit* src, char mode, int corr); void adjustEditWidgets(kMyMoneyEdit* dst, kMyMoneyEdit* src, char mode, int corr);
protected slots: protected slots:

34
kmymoney2/dialogs/knewaccountdlgdecl.ui
Unescape View File

@ -49,13 +49,13 @@
<property name="name"> <property name="name">
<cstring>TextLabel1</cstring> <cstring>TextLabel1</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>60</width> <width>60</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>60</width> <width>60</width>
<height>32767</height> <height>32767</height>
@ -136,7 +136,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel1_2</cstring> <cstring>TextLabel1_2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -214,7 +214,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>140</width> <width>140</width>
<height>20</height> <height>20</height>
@ -235,13 +235,13 @@
<property name="name"> <property name="name">
<cstring>TextLabel5</cstring> <cstring>TextLabel5</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -333,7 +333,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -418,13 +418,13 @@
<property name="name"> <property name="name">
<cstring>TextLabel2_2</cstring> <cstring>TextLabel2_2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>60</width> <width>60</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>60</width> <width>60</width>
<height>32767</height> <height>32767</height>
@ -477,7 +477,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>30</height> <height>30</height>
@ -638,7 +638,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>
@ -733,7 +733,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -754,7 +754,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -815,13 +815,13 @@
<property name="name"> <property name="name">
<cstring>m_amountGroup</cstring> <cstring>m_amountGroup</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -871,7 +871,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>
@ -933,7 +933,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>422</width> <width>422</width>
<height>0</height> <height>0</height>

16
kmymoney2/dialogs/knewbankdlgdecl.ui
Unescape View File

@ -62,7 +62,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel2</cstring> <cstring>TextLabel2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -81,7 +81,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel3</cstring> <cstring>TextLabel3</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -100,7 +100,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel4</cstring> <cstring>TextLabel4</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -119,7 +119,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel5</cstring> <cstring>TextLabel5</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -138,7 +138,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel6</cstring> <cstring>TextLabel6</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -157,7 +157,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel7</cstring> <cstring>TextLabel7</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -184,7 +184,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>16</height> <height>16</height>
@ -232,7 +232,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>449</width> <width>449</width>
<height>0</height> <height>0</height>

2
kmymoney2/dialogs/knewbudgetdlg.cpp
Unescape View File

@ -41,7 +41,7 @@ KNewBudgetDlg::KNewBudgetDlg(TQWidget* parent, const char *name) :
KNewBudgetDlgDecl(parent, name) KNewBudgetDlgDecl(parent, name)
{ {
TQStringList slYear; TQStringList slYear;
TQDate dToday = TQDate::tqcurrentDate(); TQDate dToday = TQDate::currentDate();
int iYear = dToday.year(); int iYear = dToday.year();
for (int i=0; i<=m_icFutureYears; i++) for (int i=0; i<=m_icFutureYears; i++)

4
kmymoney2/dialogs/knewequityentrydecl.ui
Unescape View File

@ -150,7 +150,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -175,7 +175,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>81</width> <width>81</width>
<height>20</height> <height>20</height>

18
kmymoney2/dialogs/knewfiledlgdecl.ui
Unescape View File

@ -84,7 +84,7 @@ your KMyMoney file.</string>
<property name="name"> <property name="name">
<cstring>TextLabel4</cstring> <cstring>TextLabel4</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -113,7 +113,7 @@ your KMyMoney file.</string>
<property name="name"> <property name="name">
<cstring>TextLabel2</cstring> <cstring>TextLabel2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -132,7 +132,7 @@ your KMyMoney file.</string>
<property name="name"> <property name="name">
<cstring>TextLabel7</cstring> <cstring>TextLabel7</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -154,7 +154,7 @@ your KMyMoney file.</string>
<property name="name"> <property name="name">
<cstring>TextLabel6</cstring> <cstring>TextLabel6</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -168,7 +168,7 @@ your KMyMoney file.</string>
<property name="name"> <property name="name">
<cstring>TextLabel3</cstring> <cstring>TextLabel3</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -187,7 +187,7 @@ your KMyMoney file.</string>
<property name="name"> <property name="name">
<cstring>TextLabel5</cstring> <cstring>TextLabel5</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -235,7 +235,7 @@ your KMyMoney file.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>305</width> <width>305</width>
<height>21</height> <height>21</height>
@ -254,7 +254,7 @@ your KMyMoney file.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -279,7 +279,7 @@ your KMyMoney file.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>360</width> <width>360</width>
<height>16</height> <height>16</height>

18
kmymoney2/dialogs/knewinvestmentwizarddecl.ui
Unescape View File

@ -47,7 +47,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>10</height> <height>10</height>
@ -75,7 +75,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>
@ -128,7 +128,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>21</height> <height>21</height>
@ -147,7 +147,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>60</height> <height>60</height>
@ -188,7 +188,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -374,7 +374,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -478,7 +478,7 @@
<property name="name"> <property name="name">
<cstring>m_onlineSourceCombo</cstring> <cstring>m_onlineSourceCombo</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>180</width> <width>180</width>
<height>0</height> <height>0</height>
@ -522,7 +522,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>371</width> <width>371</width>
<height>20</height> <height>20</height>
@ -541,7 +541,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>181</height> <height>181</height>

4
kmymoney2/dialogs/knewloanwizard.cpp
Unescape View File

@ -111,7 +111,7 @@ KNewLoanWizard::KNewLoanWizard(TQWidget *parent, const char *name ) :
m_interestFrequencyAmountEdit->setValue(1); m_interestFrequencyAmountEdit->setValue(1);
m_interestFrequencyUnitEdit->setCurrentItem(static_cast<int>(MyMoneyAccountLoan::changeYearly)); m_interestFrequencyUnitEdit->setCurrentItem(static_cast<int>(MyMoneyAccountLoan::changeYearly));
m_paymentFrequencyUnitEdit->setCurrentItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_MONTHLY))); 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_paymentAccountEdit->removeButtons();
m_assetAccountEdit->removeButtons(); m_assetAccountEdit->removeButtons();
@ -557,7 +557,7 @@ void KNewLoanWizard::next()
if(m_assetAccountPage) if(m_assetAccountPage)
setAppropriate(m_assetAccountPage, true); setAppropriate(m_assetAccountPage, true);
} else { } 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); m_nextDueDateEdit->setDate(nextPayment);
if(m_assetAccountPage) if(m_assetAccountPage)
setAppropriate(m_assetAccountPage, false); setAppropriate(m_assetAccountPage, false);

170
kmymoney2/dialogs/knewloanwizarddecl.ui
Unescape View File

@ -12,7 +12,7 @@
<height>458</height> <height>458</height>
</rect> </rect>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>800</width> <width>800</width>
<height>32767</height> <height>32767</height>
@ -63,7 +63,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>98</width> <width>98</width>
<height>0</height> <height>0</height>
@ -98,7 +98,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>119</width> <width>119</width>
<height>0</height> <height>0</height>
@ -131,7 +131,7 @@ Please make sure that you have the relevant information handy. You usually get t
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -175,7 +175,7 @@ Please make sure that you have the relevant information handy. You usually get t
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>98</width> <width>98</width>
<height>0</height> <height>0</height>
@ -210,7 +210,7 @@ Please make sure that you have the relevant information handy. You usually get t
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>119</width> <width>119</width>
<height>0</height> <height>0</height>
@ -243,7 +243,7 @@ Please make sure that you have the relevant information handy. You usually get t
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -291,7 +291,7 @@ In the first step, KMyMoney will ask you some general information about the loan
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>32</height> <height>32</height>
@ -322,7 +322,7 @@ In the first step, KMyMoney will ask you some general information about the loan
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>138</width> <width>138</width>
<height>0</height> <height>0</height>
@ -378,7 +378,7 @@ In the first step, KMyMoney will ask you some general information about the loan
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>25</height> <height>25</height>
@ -397,7 +397,7 @@ In the first step, KMyMoney will ask you some general information about the loan
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>137</width> <width>137</width>
<height>0</height> <height>0</height>
@ -416,7 +416,7 @@ In the first step, KMyMoney will ask you some general information about the loan
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>32</height> <height>32</height>
@ -464,7 +464,7 @@ Please select, which data of the loan you want to modify.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>48</height> <height>48</height>
@ -495,7 +495,7 @@ Please select, which data of the loan you want to modify.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>93</width> <width>93</width>
<height>0</height> <height>0</height>
@ -561,7 +561,7 @@ Please select, which data of the loan you want to modify.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>108</width> <width>108</width>
<height>0</height> <height>0</height>
@ -580,7 +580,7 @@ Please select, which data of the loan you want to modify.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>47</height> <height>47</height>
@ -638,7 +638,7 @@ Please select, which data of the loan you want to modify.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>30</height> <height>30</height>
@ -684,7 +684,7 @@ Please select, which data of the loan you want to modify.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>87</height> <height>87</height>
@ -732,7 +732,7 @@ Do you borrow or lend money?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>61</height> <height>61</height>
@ -804,7 +804,7 @@ Do you borrow or lend money?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>299</width> <width>299</width>
<height>0</height> <height>0</height>
@ -823,7 +823,7 @@ Do you borrow or lend money?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>60</height> <height>60</height>
@ -865,7 +865,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>56</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>56</height> <height>56</height>
@ -959,7 +959,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>56</height> <height>56</height>
@ -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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>53</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>286</width> <width>286</width>
<height>0</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>53</height> <height>53</height>
@ -1146,7 +1146,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>32</height> <height>32</height>
@ -1218,7 +1218,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>202</width> <width>202</width>
<height>0</height> <height>0</height>
@ -1237,7 +1237,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>32</height> <height>32</height>
@ -1265,7 +1265,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>32</height> <height>32</height>
@ -1313,7 +1313,7 @@ Do you want to record all payments of this loan with KMyMoney?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>69</height> <height>69</height>
@ -1385,7 +1385,7 @@ Do you want to record all payments of this loan with KMyMoney?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>137</width> <width>137</width>
<height>0</height> <height>0</height>
@ -1404,7 +1404,7 @@ Do you want to record all payments of this loan with KMyMoney?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>69</height> <height>69</height>
@ -1446,7 +1446,7 @@ Select the date when the interest rate for this loan will be modified and the fr
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>99</height> <height>99</height>
@ -1522,7 +1522,7 @@ Select the date when the interest rate for this loan will be modified and the fr
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>80</height> <height>80</height>
@ -1570,7 +1570,7 @@ Please enter the amount you pay for principal and interest or leave the field em
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>21</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>19</height> <height>19</height>
@ -1743,7 +1743,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>29</height> <height>29</height>
@ -1774,7 +1774,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>101</width> <width>101</width>
<height>0</height> <height>0</height>
@ -1836,7 +1836,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>101</width> <width>101</width>
<height>0</height> <height>0</height>
@ -1855,7 +1855,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>29</height> <height>29</height>
@ -1915,7 +1915,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>78</height> <height>78</height>
@ -1961,7 +1961,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>28</height> <height>28</height>
@ -2020,7 +2020,7 @@ You have successfully entered the general information about your loan. Next, KMy
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>19</height> <height>19</height>
@ -2051,7 +2051,7 @@ You have successfully entered the general information about your loan. Next, KMy
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>136</width> <width>136</width>
<height>0</height> <height>0</height>
@ -2117,7 +2117,7 @@ You have successfully entered the general information about your loan. Next, KMy
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>18</height> <height>18</height>
@ -2136,7 +2136,7 @@ You have successfully entered the general information about your loan. Next, KMy
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>135</width> <width>135</width>
<height>0</height> <height>0</height>
@ -2155,7 +2155,7 @@ You have successfully entered the general information about your loan. Next, KMy
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>23</height> <height>23</height>
@ -2203,7 +2203,7 @@ How often will there be payments made to this loan?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>49</height> <height>49</height>
@ -2234,7 +2234,7 @@ How often will there be payments made to this loan?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>39</width> <width>39</width>
<height>0</height> <height>0</height>
@ -2256,7 +2256,7 @@ How often will there be payments made to this loan?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>56</width> <width>56</width>
<height>0</height> <height>0</height>
@ -2275,7 +2275,7 @@ How often will there be payments made to this loan?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>49</height> <height>49</height>
@ -2323,7 +2323,7 @@ When does the actual interest rate get calculated?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>69</height> <height>69</height>
@ -2395,7 +2395,7 @@ When does the actual interest rate get calculated?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>296</width> <width>296</width>
<height>0</height> <height>0</height>
@ -2414,7 +2414,7 @@ When does the actual interest rate get calculated?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>69</height> <height>69</height>
@ -2461,7 +2461,7 @@ When does the actual interest rate get calculated?</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>15</height> <height>15</height>
@ -2695,7 +2695,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>16</height> <height>16</height>
@ -2923,7 +2923,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>54</height> <height>54</height>
@ -3164,7 +3164,7 @@ Please enter the amount you pay for principal and interest or leave the field em
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>16</height> <height>16</height>
@ -3398,7 +3398,7 @@ Please enter the amount of a final amortization payment or leave the field empty
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>16</height> <height>16</height>
@ -3632,7 +3632,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>22</height> <height>22</height>
@ -3837,7 +3837,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>14</height> <height>14</height>
@ -3868,7 +3868,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>136</width> <width>136</width>
<height>0</height> <height>0</height>
@ -3937,7 +3937,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>18</height> <height>18</height>
@ -3956,7 +3956,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>135</width> <width>135</width>
<height>0</height> <height>0</height>
@ -3975,7 +3975,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>18</height> <height>18</height>
@ -4023,7 +4023,7 @@ Please select the category you want to assign the interest payments to or create
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>38</height> <height>38</height>
@ -4059,7 +4059,7 @@ Please select the category you want to assign the interest payments to or create
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>264</width> <width>264</width>
<height>0</height> <height>0</height>
@ -4086,7 +4086,7 @@ Please select the category you want to assign the interest payments to or create
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>22</height> <height>22</height>
@ -4134,7 +4134,7 @@ If your regular payment contains any additional fees, click on the button "Addit
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>16</height> <height>16</height>
@ -4285,7 +4285,7 @@ If your regular payment contains any additional fees, click on the button "Addit
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -4302,7 +4302,7 @@ If your regular payment contains any additional fees, click on the button "Addit
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -4321,7 +4321,7 @@ If your regular payment contains any additional fees, click on the button "Addit
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>16</height> <height>16</height>
@ -4349,7 +4349,7 @@ If your regular payment contains any additional fees, click on the button "Addit
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>16</height> <height>16</height>
@ -4397,7 +4397,7 @@ If you selected to record all payments this date has already been supplied. If y
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>23</height> <height>23</height>
@ -4459,7 +4459,7 @@ If you selected to record all payments this date has already been supplied. If y
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>24</height> <height>24</height>
@ -4507,7 +4507,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>23</height> <height>23</height>
@ -4733,7 +4733,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>
@ -4779,7 +4779,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>466</width> <width>466</width>
<height>20</height> <height>20</height>
@ -4837,7 +4837,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -4885,7 +4885,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>16</height> <height>16</height>
@ -5444,7 +5444,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>16</height> <height>16</height>

2
kmymoney2/dialogs/konlinequoteconfigurationdecl.ui
Unescape View File

@ -64,7 +64,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

8
kmymoney2/dialogs/kpayeereassigndlgdecl.ui
Unescape View File

@ -29,7 +29,7 @@
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>300</width> <width>300</width>
<height>0</height> <height>0</height>
@ -52,7 +52,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -82,7 +82,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -132,7 +132,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>305</width> <width>305</width>
<height>20</height> <height>20</height>

4
kmymoney2/dialogs/kplugindlg.ui
Unescape View File

@ -36,7 +36,7 @@
</column> </column>
<column> <column>
<property name="text"> <property name="text">
<string>tqStatus</string> <string>Status</string>
</property> </property>
<property name="clickable"> <property name="clickable">
<bool>true</bool> <bool>true</bool>
@ -82,7 +82,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>180</width> <width>180</width>
<height>20</height> <height>20</height>

20
kmymoney2/dialogs/kreconciledlg.cpp
Unescape View File

@ -43,11 +43,11 @@ KReconcileDlg::KReconcileDlg(const MyMoneyMoney /* previousBal */, const MyMoney
m_endingDate = endingDate; m_endingDate = endingDate;
totalCreditsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); totalCreditsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine);
totalDebitsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); totalDebitsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine);
previousLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); previousLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine);
endingLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); endingLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine);
differenceLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); differenceLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine);
debitListView->setRootIsDecorated(false); debitListView->setRootIsDecorated(false);
@ -313,11 +313,11 @@ void KReconcileDlg::resetData(const MyMoneyMoney /* previousBal */, const MyMone
m_endingDate = endingDate; m_endingDate = endingDate;
//totalCreditsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); //totalCreditsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine);
//totalDebitsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); //totalDebitsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine);
//previousLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); //previousLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine);
//endingLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); //endingLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine);
//differenceLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); //differenceLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine);
endingLabel->setText(KGlobal::locale()->formatMoney(m_clearedBalance.amount(),"")); endingLabel->setText(KGlobal::locale()->formatMoney(m_clearedBalance.amount(),""));

32
kmymoney2/dialogs/kreconciledlgdecl.ui
Unescape View File

@ -12,7 +12,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -103,7 +103,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<property name="name"> <property name="name">
<cstring>Layout25</cstring> <cstring>Layout25</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>420</width> <width>420</width>
<height>0</height> <height>0</height>
@ -131,7 +131,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>420</width> <width>420</width>
<height>15</height> <height>15</height>
@ -153,7 +153,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>420</width> <width>420</width>
<height>100</height> <height>100</height>
@ -188,7 +188,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>15</height> <height>15</height>
@ -210,7 +210,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>420</width> <width>420</width>
<height>100</height> <height>100</height>
@ -264,7 +264,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -313,7 +313,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -332,7 +332,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>250</width> <width>250</width>
<height>120</height> <height>120</height>
@ -377,7 +377,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>
<height>0</height> <height>0</height>
@ -441,7 +441,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>
<height>0</height> <height>0</height>
@ -468,7 +468,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -511,7 +511,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>
<height>0</height> <height>0</height>
@ -538,7 +538,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -581,7 +581,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>
<height>0</height> <height>0</height>
@ -655,7 +655,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>

2
kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp
Unescape View File

@ -378,7 +378,7 @@ void KReportConfigurationFilterDlg::slotReset(void)
for(it_b = m_budgets.begin(); it_b != m_budgets.end(); ++it_b) { for(it_b = m_budgets.begin(); it_b != m_budgets.end(); ++it_b) {
m_tab2->m_comboBudget->insertItem((*it_b).name(), i); m_tab2->m_comboBudget->insertItem((*it_b).name(), i);
//set the current selected item //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_initialState.budget() == (*it_b).id())
m_tab2->m_comboBudget->setCurrentItem(i); m_tab2->m_comboBudget->setCurrentItem(i);
i++; i++;

6
kmymoney2/dialogs/ksecuritylisteditordecl.ui
Unescape View File

@ -141,7 +141,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>51</height> <height>51</height>
@ -182,7 +182,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>110</height> <height>110</height>
@ -233,7 +233,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>91</width> <width>91</width>
<height>20</height> <height>20</height>

4
kmymoney2/dialogs/kselectdatabasedlgdecl.ui
Unescape View File

@ -177,7 +177,7 @@ As always, please make sure you have adequate backups of your data.&lt;/font&gt;
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -202,7 +202,7 @@ As always, please make sure you have adequate backups of your data.&lt;/font&gt;
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>20</height> <height>20</height>

2
kmymoney2/dialogs/kselecttransactionsdlgdecl.ui
Unescape View File

@ -123,7 +123,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>430</width> <width>430</width>
<height>20</height> <height>20</height>

2
kmymoney2/dialogs/ksortoptiondlg.ui
Unescape View File

@ -61,7 +61,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>237</width> <width>237</width>
<height>20</height> <height>20</height>

10
kmymoney2/dialogs/ksplitcorrectiondlg.ui
Unescape View File

@ -12,7 +12,7 @@
<height>292</height> <height>292</height>
</rect> </rect>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>0</height> <height>0</height>
@ -133,7 +133,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>41</height> <height>41</height>
@ -172,7 +172,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>20</height> <height>20</height>
@ -191,7 +191,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>0</height> <height>0</height>
@ -213,7 +213,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>0</height> <height>0</height>

2
kmymoney2/dialogs/ksplittransactiondlg.cpp
Unescape View File

@ -126,7 +126,7 @@ KSplitTransactionDlg::KSplitTransactionDlg(const MyMoneyTransaction& t,
kapp->config()->setGroup("SplitTransactionEditor"); kapp->config()->setGroup("SplitTransactionEditor");
size = kapp->config()->readSizeEntry("Geometry", &size); size = kapp->config()->readSizeEntry("Geometry", &size);
size.setHeight(size.height()-1); 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 // Trick: it seems, that the initial sizing of the dialog does
// not work correctly. At least, the columns do not get displayed // not work correctly. At least, the columns do not get displayed

18
kmymoney2/dialogs/ksplittransactiondlgdecl.ui
Unescape View File

@ -88,7 +88,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>16</height> <height>16</height>
@ -99,7 +99,7 @@
<property name="name"> <property name="name">
<cstring>Layout49</cstring> <cstring>Layout49</cstring>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>80</height> <height>80</height>
@ -127,7 +127,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>120</width> <width>120</width>
<height>15</height> <height>15</height>
@ -154,7 +154,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>120</width> <width>120</width>
<height>15</height> <height>15</height>
@ -217,7 +217,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>120</width> <width>120</width>
<height>15</height> <height>15</height>
@ -236,7 +236,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel1_2_2</cstring> <cstring>TextLabel1_2_2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>0</height> <height>0</height>
@ -284,13 +284,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>15</width> <width>15</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>80</height> <height>80</height>
@ -364,7 +364,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>120</height> <height>120</height>

2
kmymoney2/dialogs/kupdatestockpricedlg.cpp
Unescape View File

@ -37,7 +37,7 @@
KUpdateStockPriceDlg::KUpdateStockPriceDlg(TQWidget* parent, const char* name) : KUpdateStockPriceDlg::KUpdateStockPriceDlg(TQWidget* parent, const char* name) :
kUpdateStockPriceDecl(parent, name, true) kUpdateStockPriceDecl(parent, name, true)
{ {
m_date->setDate(TQDate::tqcurrentDate()); m_date->setDate(TQDate::currentDate());
init(); init();
} }

10
kmymoney2/dialogs/kupdatestockpricedlgdecl.ui
Unescape View File

@ -50,7 +50,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>71</width> <width>71</width>
<height>21</height> <height>21</height>
@ -90,7 +90,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -154,7 +154,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -175,7 +175,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>40</height> <height>40</height>
@ -214,7 +214,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>71</width> <width>71</width>
<height>21</height> <height>21</height>

38
kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui
Unescape View File

@ -84,7 +84,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel2_2_3</cstring> <cstring>TextLabel2_2_3</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>0</height> <height>0</height>
@ -98,7 +98,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel2_2</cstring> <cstring>TextLabel2_2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>0</height> <height>0</height>
@ -117,7 +117,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel2</cstring> <cstring>TextLabel2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>0</height> <height>0</height>
@ -141,7 +141,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel2_2_2</cstring> <cstring>TextLabel2_2_2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>0</height> <height>0</height>
@ -165,7 +165,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel1</cstring> <cstring>TextLabel1</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>0</height> <height>0</height>
@ -195,7 +195,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -243,7 +243,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel3</cstring> <cstring>TextLabel3</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>0</height> <height>0</height>
@ -268,7 +268,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel4</cstring> <cstring>TextLabel4</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>0</height> <height>0</height>
@ -293,7 +293,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>90</width> <width>90</width>
<height>20</height> <height>20</height>
@ -312,7 +312,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>80</height> <height>80</height>
@ -586,7 +586,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel1_2</cstring> <cstring>TextLabel1_2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>0</height> <height>0</height>
@ -600,7 +600,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel1_3</cstring> <cstring>TextLabel1_3</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>0</height> <height>0</height>
@ -627,7 +627,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>100</width> <width>100</width>
<height>20</height> <height>20</height>
@ -646,7 +646,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>16</height> <height>16</height>
@ -678,7 +678,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel1_4_2</cstring> <cstring>TextLabel1_4_2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>0</height> <height>0</height>
@ -705,7 +705,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel1_4_3</cstring> <cstring>TextLabel1_4_3</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>0</height> <height>0</height>
@ -727,7 +727,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel1_4</cstring> <cstring>TextLabel1_4</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>0</height> <height>0</height>
@ -749,7 +749,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>90</height> <height>90</height>
@ -823,7 +823,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>104</width> <width>104</width>
<height>0</height> <height>0</height>

4
kmymoney2/dialogs/settings/ksettingscolorsdecl.ui
Unescape View File

@ -157,7 +157,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -382,7 +382,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
kmymoney2/dialogs/settings/ksettingsfontsdecl.ui
Unescape View File

@ -58,7 +58,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>110</width> <width>110</width>
<height>20</height> <height>20</height>
@ -75,7 +75,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>100</width> <width>100</width>
<height>20</height> <height>20</height>
@ -110,7 +110,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>

6
kmymoney2/dialogs/settings/ksettingsforecastdecl.ui
Unescape View File

@ -105,7 +105,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>133</width> <width>133</width>
<height>21</height> <height>21</height>
@ -187,7 +187,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>130</width> <width>130</width>
<height>21</height> <height>21</height>
@ -255,7 +255,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>

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

@ -120,7 +120,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>21</height> <height>21</height>
@ -194,7 +194,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>354</width> <width>354</width>
<height>20</height> <height>20</height>
@ -304,7 +304,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>90</width> <width>90</width>
<height>20</height> <height>20</height>
@ -323,7 +323,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -452,7 +452,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>
@ -588,7 +588,7 @@ You can use &lt;b&gt;View/Show all accounts&lt;/b&gt; to temporarily show hidden
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>63</width> <width>63</width>
<height>20</height> <height>20</height>
@ -620,7 +620,7 @@ You can use &lt;b&gt;View/Show all accounts&lt;/b&gt; to temporarily show hidden
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>

6
kmymoney2/dialogs/settings/ksettingsgpgdecl.ui
Unescape View File

@ -142,7 +142,7 @@ The &lt;i&gt;additional recovery encryption&lt;/i&gt; is only accessible, if the
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>
@ -191,7 +191,7 @@ The &lt;i&gt;additional recovery encryption&lt;/i&gt; is only accessible, if the
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>30</height> <height>30</height>

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

@ -45,7 +45,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -78,7 +78,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>70</height> <height>70</height>
@ -97,7 +97,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>21</height> <height>21</height>
@ -193,7 +193,7 @@ Use the buttons and checkboxes to customize the tqlayout of the home page.</stri
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>

4
kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui
Unescape View File

@ -12,7 +12,7 @@
<height>442</height> <height>442</height>
</rect> </rect>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -211,7 +211,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>240</width> <width>240</width>
<height>20</height> <height>20</height>

10
kmymoney2/dialogs/settings/ksettingsregisterdecl.ui
Unescape View File

@ -110,7 +110,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -323,7 +323,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>20</height> <height>20</height>
@ -432,7 +432,7 @@ Selecting 0% will list all transactions.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -498,7 +498,7 @@ Selecting 0% will list all transactions.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>20</height> <height>20</height>
@ -531,7 +531,7 @@ Selecting 0% will list all transactions.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>60</height> <height>60</height>

4
kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui
Unescape View File

@ -103,7 +103,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>21</height> <height>21</height>
@ -122,7 +122,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>

16
kmymoney2/dialogs/transactioneditor.cpp
Unescape View File

@ -599,7 +599,7 @@ bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule,
if((*it_ts).id().isEmpty()) { if((*it_ts).id().isEmpty()) {
bool enter = true; bool enter = true;
if(askForSchedule && (*it_ts).postDate() > TQDate::tqcurrentDate()) { if(askForSchedule && (*it_ts).postDate() > TQDate::currentDate()) {
KGuiItem enterItem; KGuiItem enterItem;
KIconLoader* il = KGlobal::iconLoader(); KIconLoader* il = KGlobal::iconLoader();
KGuiItem enterButton( i18n("&Enter" ), KGuiItem enterButton( i18n("&Enter" ),
@ -859,7 +859,7 @@ void StdTransactionEditor::createEditWidgets(void)
TQLabel* label; TQLabel* label;
m_editWidgets["category-label"] = label = new TQLabel(i18n("Category"), 0); 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) // create a copy of tabbar above the form (if we are created for a form)
KMyMoneyTransactionForm::TransactionForm* form = dynamic_cast<KMyMoneyTransactionForm::TransactionForm*>(m_regForm); KMyMoneyTransactionForm::TransactionForm* form = dynamic_cast<KMyMoneyTransactionForm::TransactionForm*>(m_regForm);
@ -872,11 +872,11 @@ void StdTransactionEditor::createEditWidgets(void)
} }
label = new TQLabel(i18n("Date"), 0); label = new TQLabel(i18n("Date"), 0);
label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["date-label"] = label; m_editWidgets["date-label"] = label;
label = new TQLabel(i18n("Number"), 0); label = new TQLabel(i18n("Number"), 0);
label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["number-label"] = label; m_editWidgets["number-label"] = label;
setupPrecision(); setupPrecision();
@ -966,7 +966,7 @@ void StdTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action action)
else if(m_lastPostDate.isValid()) else if(m_lastPostDate.isValid())
dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(m_lastPostDate); dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(m_lastPostDate);
else else
dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(TQDate::tqcurrentDate()); dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(TQDate::currentDate());
if((w = haveWidget("number")) != 0) { if((w = haveWidget("number")) != 0) {
dynamic_cast<kMyMoneyLineEdit*>(w)->loadText(m_split.number()); 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 // check if date has been altered by user
kMyMoneyDateInput* postDate = dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"]); kMyMoneyDateInput* postDate = dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"]);
if((m_lastPostDate.isValid() && (postDate->date() != m_lastPostDate)) if((m_lastPostDate.isValid() && (postDate->date() != m_lastPostDate))
|| (!m_lastPostDate.isValid() && (postDate->date() != TQDate::tqcurrentDate()))) || (!m_lastPostDate.isValid() && (postDate->date() != TQDate::currentDate())))
return; return;
#endif #endif
@ -1615,7 +1615,7 @@ void StdTransactionEditor::updateVAT(bool amountChanged)
// if we made this a split transaction, then move the // if we made this a split transaction, then move the
// focus to the memo field // focus to the memo field
if(tqApp->tqfocusWidget() == haveWidget("category")) { if(tqApp->focusWidget() == haveWidget("category")) {
TQWidget* w = haveWidget("memo"); TQWidget* w = haveWidget("memo");
if(w) if(w)
w->setFocus(); w->setFocus();
@ -2029,7 +2029,7 @@ bool StdTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyMone
s0.setReconcileFlag(status->state()); s0.setReconcileFlag(status->state());
if(s0.reconcileFlag() == MyMoneySplit::Reconciled && !s0.reconcileDate().isValid()) if(s0.reconcileFlag() == MyMoneySplit::Reconciled && !s0.reconcileDate().isValid())
s0.setReconcileDate(TQDate::tqcurrentDate()); s0.setReconcileDate(TQDate::currentDate());
checkPayeeInSplit(s0, payeeId); checkPayeeInSplit(s0, payeeId);

40
kmymoney2/kmymoney2.cpp
Unescape View File

@ -558,7 +558,7 @@ void KMyMoney2App::initStatusBar(void)
progressBar->setLineWidth(0); progressBar->setLineWidth(0);
progressBar->setBackgroundMode(TQWidget::PaletteBackground); progressBar->setBackgroundMode(TQWidget::PaletteBackground);
statusBar()->addWidget(progressBar); statusBar()->addWidget(progressBar);
progressBar->setFixedHeight(progressBar->tqsizeHint().height() - 8); progressBar->setFixedHeight(progressBar->sizeHint().height() - 8);
// hide the progress bar for now // hide the progress bar for now
slotStatusProgressBar(-1, -1); slotStatusProgressBar(-1, -1);
@ -722,7 +722,7 @@ void KMyMoney2App::slotPerformanceTest(void)
measurement[0] = measurement[1] = 0; measurement[0] = measurement[1] = 0;
if(MyMoneyFile::instance()->asset().accountCount()) { if(MyMoneyFile::instance()->asset().accountCount()) {
MyMoneyTransactionFilter filter(MyMoneyFile::instance()->asset().accountList()[0]); MyMoneyTransactionFilter filter(MyMoneyFile::instance()->asset().accountList()[0]);
filter.setDateFilter(TQDate(), TQDate::tqcurrentDate()); filter.setDateFilter(TQDate(), TQDate::currentDate());
TQValueList<MyMoneyTransaction> list; TQValueList<MyMoneyTransaction> list;
timer.start(); timer.start();
@ -741,7 +741,7 @@ void KMyMoney2App::slotPerformanceTest(void)
measurement[0] = measurement[1] = 0; measurement[0] = measurement[1] = 0;
if(MyMoneyFile::instance()->asset().accountCount()) { if(MyMoneyFile::instance()->asset().accountCount()) {
MyMoneyTransactionFilter filter(MyMoneyFile::instance()->asset().accountList()[0]); MyMoneyTransactionFilter filter(MyMoneyFile::instance()->asset().accountList()[0]);
filter.setDateFilter(TQDate(), TQDate::tqcurrentDate()); filter.setDateFilter(TQDate(), TQDate::currentDate());
TQValueList<MyMoneyTransaction> list; TQValueList<MyMoneyTransaction> list;
timer.start(); timer.start();
@ -1963,9 +1963,9 @@ void KMyMoney2App::slotProcessExited(void)
proc.clearArguments(); proc.clearArguments();
TQString today; TQString today;
today.sprintf("-%04d-%02d-%02d.kmy", today.sprintf("-%04d-%02d-%02d.kmy",
TQDate::tqcurrentDate().year(), TQDate::currentDate().year(),
TQDate::tqcurrentDate().month(), TQDate::currentDate().month(),
TQDate::tqcurrentDate().day()); TQDate::currentDate().day());
TQString backupfile = m_mountpoint + "/" + m_fileName.fileName(false); TQString backupfile = m_mountpoint + "/" + m_fileName.fileName(false);
KMyMoneyUtils::appendCorrectFileExt(backupfile, today); KMyMoneyUtils::appendCorrectFileExt(backupfile, today);
@ -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. // I have seen in some usability tests. So we just delete it right away.
KConfig *kconfig = KGlobal::config(); KConfig *kconfig = KGlobal::config();
if(kconfig) { if(kconfig) {
kconfig->setGroup(TQString::tqfromLatin1("Notification Messages")); kconfig->setGroup(TQString::fromLatin1("Notification Messages"));
kconfig->deleteEntry(TQString::tqfromLatin1("CreateNewCategories")); kconfig->deleteEntry(TQString::fromLatin1("CreateNewCategories"));
} }
} }
} }
@ -2461,7 +2461,7 @@ void KMyMoney2App::createCategory(MyMoneyAccount& account, const MyMoneyAccount&
void KMyMoney2App::slotAccountNew(void) void KMyMoney2App::slotAccountNew(void)
{ {
MyMoneyAccount acc; MyMoneyAccount acc;
acc.setOpeningDate(TQDate::tqcurrentDate()); acc.setOpeningDate(TQDate::currentDate());
slotAccountNew(acc); slotAccountNew(acc);
} }
@ -2584,8 +2584,8 @@ void KMyMoney2App::slotInvestmentDelete(void)
// I have seen in some usability tests. So we just delete it right away. // I have seen in some usability tests. So we just delete it right away.
KConfig *kconfig = KGlobal::config(); KConfig *kconfig = KGlobal::config();
if(kconfig) { if(kconfig) {
kconfig->setGroup(TQString::tqfromLatin1("Notification Messages")); kconfig->setGroup(TQString::fromLatin1("Notification Messages"));
kconfig->deleteEntry(TQString::tqfromLatin1("DeleteInvestment")); kconfig->deleteEntry(TQString::fromLatin1("DeleteInvestment"));
} }
} }
} }
@ -3772,14 +3772,14 @@ void KMyMoney2App::slotPayeeNew(const TQString& newnameBase, TQString& id)
if(newnameBase != i18n("New Payee")) { if(newnameBase != i18n("New Payee")) {
// Ask the user if that is what he intended to do? // Ask the user if that is what he intended to do?
TQString msg = TQString("<qt>") + i18n("Do you want to add <b>%1</b> as payer/receiver ?").tqarg(newnameBase) + TQString("</qt>"); TQString msg = TQString("<qt>") + i18n("Do you want to add <b>%1</b> as payer/receiver ?").tqarg(newnameBase) + TQString("</qt>");
const TQString dontAskAgain = TQString::tqfromLatin1("NewPayee"); const TQString dontAskAgain = TQString::fromLatin1("NewPayee");
if(KMessageBox::questionYesNo(this, msg, i18n("New payee/receiver"), KStdGuiItem::yes(), KStdGuiItem::no(), dontAskAgain) == KMessageBox::No) { if(KMessageBox::questionYesNo(this, msg, i18n("New payee/receiver"), KStdGuiItem::yes(), KStdGuiItem::no(), dontAskAgain) == KMessageBox::No) {
doit = false; doit = false;
// we should not keep the 'no' setting because that can confuse people like // 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. // I have seen in some usability tests. So we just delete it right away.
KConfig *kconfig = KGlobal::config(); KConfig *kconfig = KGlobal::config();
if(kconfig) { if(kconfig) {
kconfig->setGroup(TQString::tqfromLatin1("Notification Messages")); kconfig->setGroup(TQString::fromLatin1("Notification Messages"));
kconfig->deleteEntry(dontAskAgain); kconfig->deleteEntry(dontAskAgain);
} }
} }
@ -4097,7 +4097,7 @@ void KMyMoney2App::slotCurrencySetBase(void)
void KMyMoney2App::slotBudgetNew(void) void KMyMoney2App::slotBudgetNew(void)
{ {
TQDate date = TQDate::tqcurrentDate(Qt::LocalTime); TQDate date = TQDate::currentDate(Qt::LocalTime);
date.setYMD(date.year(), 1, 1); date.setYMD(date.year(), 1, 1);
TQString newname = i18n("Budget %1").tqarg(TQString::number(date.year())); TQString newname = i18n("Budget %1").tqarg(TQString::number(date.year()));
@ -4186,7 +4186,7 @@ void KMyMoney2App::slotBudgetChangeYear(void)
int current = 0; int current = 0;
bool haveCurrent = false; bool haveCurrent = false;
MyMoneyBudget budget = *(m_selectedBudgets.begin()); MyMoneyBudget budget = *(m_selectedBudgets.begin());
for(int i = (TQDate::tqcurrentDate().year()-3); i < (TQDate::tqcurrentDate().year()+5); ++i) { for(int i = (TQDate::currentDate().year()-3); i < (TQDate::currentDate().year()+5); ++i) {
years << TQString("%1").tqarg(i); years << TQString("%1").tqarg(i);
if(i == budget.budgetStart().year()) { if(i == budget.budgetStart().year()) {
haveCurrent = true; haveCurrent = true;
@ -4373,7 +4373,7 @@ void KMyMoney2App::slotTransactionDuplicate(void)
t.setEntryDate(TQDate()); t.setEntryDate(TQDate());
t.clearId(); t.clearId();
// and set the post date to today // and set the post date to today
t.setPostDate(TQDate::tqcurrentDate()); t.setPostDate(TQDate::currentDate());
MyMoneyFile::instance()->addTransaction(t); MyMoneyFile::instance()->addTransaction(t);
lt = t; lt = t;
@ -5721,7 +5721,7 @@ void KMyMoney2App::slotCheckSchedules(void)
KMSTATUS(i18n("Checking for overdue scheduled transactions...")); KMSTATUS(i18n("Checking for overdue scheduled transactions..."));
MyMoneyFile *file = MyMoneyFile::instance(); 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> scheduleList = file->scheduleList();
TQValueList<MyMoneySchedule>::Iterator it; TQValueList<MyMoneySchedule>::Iterator it;
@ -5987,7 +5987,7 @@ void KMyMoney2App::slotAutoSave(void)
void KMyMoney2App::slotDateChanged(void) void KMyMoney2App::slotDateChanged(void)
{ {
TQDateTime dt = TQDateTime::tqcurrentDateTime(); TQDateTime dt = TQDateTime::currentDateTime();
TQDateTime nextDay( TQDate(dt.date().addDays(1)), TQTime(0, 0, 0) ); TQDateTime nextDay( TQDate(dt.date().addDays(1)), TQTime(0, 0, 0) );
TQTimer::singleShot(dt.secsTo(nextDay)*1000, TQT_TQOBJECT(this), TQT_SLOT(slotDateChanged())); TQTimer::singleShot(dt.secsTo(nextDay)*1000, TQT_TQOBJECT(this), TQT_SLOT(slotDateChanged()));
@ -6184,12 +6184,12 @@ void KMyMoney2App::slotAccountUpdateOnline(void)
} }
} }
KMtqStatus::KMtqStatus (const TQString &text) KMStatus::KMStatus (const TQString &text)
{ {
m_prevText = kmymoney2->slotStatusMsg(text); m_prevText = kmymoney2->slotStatusMsg(text);
} }
KMtqStatus::~KMtqStatus() KMStatus::~KMStatus()
{ {
kmymoney2->slotStatusMsg(m_prevText); kmymoney2->slotStatusMsg(m_prevText);
} }

8
kmymoney2/kmymoney2.h
Unescape View File

@ -1293,15 +1293,15 @@ private:
extern KMyMoney2App *kmymoney2; extern KMyMoney2App *kmymoney2;
class KMtqStatus class KMStatus
{ {
public: public:
KMtqStatus (const TQString &text); KMStatus (const TQString &text);
~KMtqStatus(); ~KMStatus();
private: private:
TQString m_prevText; TQString m_prevText;
}; };
#define KMSTATUS(msg) KMtqStatus _thistqStatus(msg) #define KMSTATUS(msg) KMStatus _thisStatus(msg)
#endif // KMYMONEY2_H #endif // KMYMONEY2_H

2
kmymoney2/mymoney/mymoneyaccount.h
Unescape View File

@ -342,7 +342,7 @@ public:
/** /**
* This method is used to update m_lastModified to the current date * 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. * This method returns the type of the account.

46
kmymoney2/mymoney/mymoneyaccounttest.cpp
Unescape View File

@ -49,8 +49,8 @@ void MyMoneyAccountTest::testConstructor() {
MyMoneyAccount r; MyMoneyAccount r;
MyMoneySplit s; MyMoneySplit s;
r.setAccountType(MyMoneyAccount::Asset); r.setAccountType(MyMoneyAccount::Asset);
r.setOpeningDate(TQDate::tqcurrentDate()); r.setOpeningDate(TQDate::currentDate());
r.setLastModified(TQDate::tqcurrentDate()); r.setLastModified(TQDate::currentDate());
r.setDescription("Desc"); r.setDescription("Desc");
r.setNumber("465500"); r.setNumber("465500");
r.setParentAccountId(parent); r.setParentAccountId(parent);
@ -65,8 +65,8 @@ void MyMoneyAccountTest::testConstructor() {
CPPUNIT_ASSERT(a.id() == id); CPPUNIT_ASSERT(a.id() == id);
CPPUNIT_ASSERT(a.institutionId().isEmpty()); CPPUNIT_ASSERT(a.institutionId().isEmpty());
CPPUNIT_ASSERT(a.accountType() == MyMoneyAccount::Asset); CPPUNIT_ASSERT(a.accountType() == MyMoneyAccount::Asset);
CPPUNIT_ASSERT(a.openingDate() == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(a.openingDate() == TQDate::currentDate());
CPPUNIT_ASSERT(a.lastModified() == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(a.lastModified() == TQDate::currentDate());
CPPUNIT_ASSERT(a.number() == "465500"); CPPUNIT_ASSERT(a.number() == "465500");
CPPUNIT_ASSERT(a.description() == "Desc"); CPPUNIT_ASSERT(a.description() == "Desc");
CPPUNIT_ASSERT(a.accountList().count() == 0); CPPUNIT_ASSERT(a.accountList().count() == 0);
@ -82,7 +82,7 @@ void MyMoneyAccountTest::testConstructor() {
void MyMoneyAccountTest::testSetFunctions() { void MyMoneyAccountTest::testSetFunctions() {
MyMoneyAccount a; MyMoneyAccount a;
TQDate today(TQDate::tqcurrentDate()); TQDate today(TQDate::currentDate());
CPPUNIT_ASSERT(a.name().isEmpty()); CPPUNIT_ASSERT(a.name().isEmpty());
CPPUNIT_ASSERT(a.lastModified() == TQDate()); CPPUNIT_ASSERT(a.lastModified() == TQDate());
CPPUNIT_ASSERT(a.description().isEmpty()); CPPUNIT_ASSERT(a.description().isEmpty());
@ -108,8 +108,8 @@ void MyMoneyAccountTest::testCopyConstructor() {
TQString parent = "ParentAccount"; TQString parent = "ParentAccount";
MyMoneyAccount r; MyMoneyAccount r;
r.setAccountType(MyMoneyAccount::Expense); r.setAccountType(MyMoneyAccount::Expense);
r.setOpeningDate(TQDate::tqcurrentDate()); r.setOpeningDate(TQDate::currentDate());
r.setLastModified(TQDate::tqcurrentDate()); r.setLastModified(TQDate::currentDate());
r.setName("Account"); r.setName("Account");
r.setInstitutionId("Inst1"); r.setInstitutionId("Inst1");
r.setDescription("Desc1"); r.setDescription("Desc1");
@ -125,8 +125,8 @@ void MyMoneyAccountTest::testCopyConstructor() {
CPPUNIT_ASSERT(b.name() == "Account"); CPPUNIT_ASSERT(b.name() == "Account");
CPPUNIT_ASSERT(b.institutionId() == institutionid); CPPUNIT_ASSERT(b.institutionId() == institutionid);
CPPUNIT_ASSERT(b.accountType() == MyMoneyAccount::Expense); CPPUNIT_ASSERT(b.accountType() == MyMoneyAccount::Expense);
CPPUNIT_ASSERT(b.lastModified() == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(b.lastModified() == TQDate::currentDate());
CPPUNIT_ASSERT(b.openingDate() == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(b.openingDate() == TQDate::currentDate());
CPPUNIT_ASSERT(b.description() == "Desc1"); CPPUNIT_ASSERT(b.description() == "Desc1");
CPPUNIT_ASSERT(b.number() == "Number"); CPPUNIT_ASSERT(b.number() == "Number");
CPPUNIT_ASSERT(b.parentAccountId() == "ParentAccount"); CPPUNIT_ASSERT(b.parentAccountId() == "ParentAccount");
@ -146,7 +146,7 @@ void MyMoneyAccountTest::testAssignmentConstructor() {
MyMoneyAccount b; MyMoneyAccount b;
b.setLastModified(TQDate::tqcurrentDate()); b.setLastModified(TQDate::currentDate());
b = a; b = a;
@ -199,13 +199,13 @@ void MyMoneyAccountTest::testEquality()
{ {
MyMoneyAccount a; MyMoneyAccount a;
a.setLastModified(TQDate::tqcurrentDate()); a.setLastModified(TQDate::currentDate());
a.setName("Name"); a.setName("Name");
a.setNumber("Number"); a.setNumber("Number");
a.setDescription("Desc"); a.setDescription("Desc");
a.setInstitutionId("I-ID"); a.setInstitutionId("I-ID");
a.setOpeningDate(TQDate::tqcurrentDate()); a.setOpeningDate(TQDate::currentDate());
a.setLastReconciliationDate(TQDate::tqcurrentDate()); a.setLastReconciliationDate(TQDate::currentDate());
a.setAccountType(MyMoneyAccount::Asset); a.setAccountType(MyMoneyAccount::Asset);
a.setParentAccountId("P-ID"); a.setParentAccountId("P-ID");
a.setId("A-ID"); a.setId("A-ID");
@ -221,7 +221,7 @@ void MyMoneyAccountTest::testEquality()
CPPUNIT_ASSERT(!(b == a)); CPPUNIT_ASSERT(!(b == a));
b = a; b = a;
a.setLastModified(TQDate::tqcurrentDate().addDays(-1)); a.setLastModified(TQDate::currentDate().addDays(-1));
CPPUNIT_ASSERT(!(b == a)); CPPUNIT_ASSERT(!(b == a));
b = a; b = a;
@ -237,11 +237,11 @@ void MyMoneyAccountTest::testEquality()
CPPUNIT_ASSERT(!(b == a)); CPPUNIT_ASSERT(!(b == a));
b = a; b = a;
a.setOpeningDate(TQDate::tqcurrentDate().addDays(-1)); a.setOpeningDate(TQDate::currentDate().addDays(-1));
CPPUNIT_ASSERT(!(b == a)); CPPUNIT_ASSERT(!(b == a));
b = a; b = a;
a.setLastReconciliationDate(TQDate::tqcurrentDate().addDays(-1)); a.setLastReconciliationDate(TQDate::currentDate().addDays(-1));
CPPUNIT_ASSERT(!(b == a)); CPPUNIT_ASSERT(!(b == a));
b = a; b = a;
@ -278,8 +278,8 @@ void MyMoneyAccountTest::testWriteXML() {
MyMoneyAccount r; MyMoneyAccount r;
r.setAccountType(MyMoneyAccount::Asset); r.setAccountType(MyMoneyAccount::Asset);
r.setOpeningDate(TQDate::tqcurrentDate()); r.setOpeningDate(TQDate::currentDate());
r.setLastModified(TQDate::tqcurrentDate()); r.setLastModified(TQDate::currentDate());
r.setDescription("Desc"); r.setDescription("Desc");
r.setName("AccountName"); r.setName("AccountName");
r.setNumber("465500"); r.setNumber("465500");
@ -309,7 +309,7 @@ void MyMoneyAccountTest::testWriteXML() {
" </KEYVALUEPAIRS>\n" " </KEYVALUEPAIRS>\n"
" </ACCOUNT>\n" " </ACCOUNT>\n"
"</ACCOUNT-CONTAINER>\n"). "</ACCOUNT-CONTAINER>\n").
arg(TQDate::tqcurrentDate().toString(Qt::ISODate)).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); arg(TQDate::currentDate().toString(Qt::ISODate)).tqarg(TQDate::currentDate().toString(Qt::ISODate));
CPPUNIT_ASSERT(doc.toString() == ref); CPPUNIT_ASSERT(doc.toString() == ref);
} }
@ -330,7 +330,7 @@ void MyMoneyAccountTest::testReadXML() {
" </KEYVALUEPAIRS>\n" " </KEYVALUEPAIRS>\n"
" </ACCOUNT>\n" " </ACCOUNT>\n"
"</ACCOUNT-CONTAINER>\n"). "</ACCOUNT-CONTAINER>\n").
arg(TQDate::tqcurrentDate().toString(Qt::ISODate)).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); arg(TQDate::currentDate().toString(Qt::ISODate)).tqarg(TQDate::currentDate().toString(Qt::ISODate));
TQString ref_false = TQString( TQString ref_false = TQString(
"<!DOCTYPE TEST>\n" "<!DOCTYPE TEST>\n"
@ -346,7 +346,7 @@ void MyMoneyAccountTest::testReadXML() {
" </KEYVALUEPAIRS>\n" " </KEYVALUEPAIRS>\n"
" </KACCOUNT>\n" " </KACCOUNT>\n"
"</ACCOUNT-CONTAINER>\n"). "</ACCOUNT-CONTAINER>\n").
arg(TQDate::tqcurrentDate().toString(Qt::ISODate)).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); arg(TQDate::currentDate().toString(Qt::ISODate)).tqarg(TQDate::currentDate().toString(Qt::ISODate));
TQDomDocument doc; TQDomDocument doc;
TQDomElement node; TQDomElement node;
@ -371,11 +371,11 @@ void MyMoneyAccountTest::testReadXML() {
CPPUNIT_ASSERT(a.id() == "A000001"); CPPUNIT_ASSERT(a.id() == "A000001");
CPPUNIT_ASSERT(a.m_name == "AccountName"); CPPUNIT_ASSERT(a.m_name == "AccountName");
CPPUNIT_ASSERT(a.m_parentAccount == "Parent"); 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_lastReconciliationDate == TQDate());
CPPUNIT_ASSERT(a.m_institution == "B000001"); CPPUNIT_ASSERT(a.m_institution == "B000001");
CPPUNIT_ASSERT(a.m_number == "465500"); 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_accountType == MyMoneyAccount::Asset);
CPPUNIT_ASSERT(a.m_description == "Desc"); CPPUNIT_ASSERT(a.m_description == "Desc");
CPPUNIT_ASSERT(a.accountList().count() == 2); CPPUNIT_ASSERT(a.accountList().count() == 2);

2
kmymoney2/mymoney/mymoneyfile.cpp
Unescape View File

@ -619,7 +619,7 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& parent)
if(!account.openingDate().isValid()) { if(!account.openingDate().isValid()) {
account.setOpeningDate(TQDate::tqcurrentDate()); account.setOpeningDate(TQDate::currentDate());
} }
account.setParentAccountId(parent.id()); account.setParentAccountId(parent.id());

2
kmymoney2/mymoney/mymoneyfile.h
Unescape View File

@ -1145,7 +1145,7 @@ public:
* @return price found as MyMoneyPrice object * @return price found as MyMoneyPrice object
* @note This throws an exception when the base currency is not set and toId is empty * @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. * This method returns a list of all prices.

10
kmymoney2/mymoney/mymoneyfiletest.cpp
Unescape View File

@ -761,16 +761,16 @@ void MyMoneyFileTest::testAddTransaction () {
CPPUNIT_ASSERT(t.id() == "T000000000000000001"); CPPUNIT_ASSERT(t.id() == "T000000000000000001");
CPPUNIT_ASSERT(t.postDate() == TQDate(2002,2,1)); 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); CPPUNIT_ASSERT(m->dirty() == true);
// check the balance of the accounts // check the balance of the accounts
a = m->account("A000001"); a = m->account("A000001");
CPPUNIT_ASSERT(a.lastModified() == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(a.lastModified() == TQDate::currentDate());
CPPUNIT_ASSERT(a.balance() == MyMoneyMoney(-1000)); CPPUNIT_ASSERT(a.balance() == MyMoneyMoney(-1000));
MyMoneyAccount b = m->account("A000003"); MyMoneyAccount b = m->account("A000003");
CPPUNIT_ASSERT(b.lastModified() == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(b.lastModified() == TQDate::currentDate());
CPPUNIT_ASSERT(b.balance() == MyMoneyMoney(1000)); CPPUNIT_ASSERT(b.balance() == MyMoneyMoney(1000));
storage->m_dirty = false; storage->m_dirty = false;
@ -1490,7 +1490,7 @@ void MyMoneyFileTest::testOpeningBalance(void)
openingAcc = m->openingBalanceAccount(m->baseCurrency()); openingAcc = m->openingBalanceAccount(m->baseCurrency());
CPPUNIT_ASSERT(openingAcc.parentAccountId() == m->equity().id()); CPPUNIT_ASSERT(openingAcc.parentAccountId() == m->equity().id());
CPPUNIT_ASSERT(openingAcc.name() == MyMoneyFile::OpeningBalancesPrefix); CPPUNIT_ASSERT(openingAcc.name() == MyMoneyFile::OpeningBalancesPrefix);
CPPUNIT_ASSERT(openingAcc.openingDate() == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(openingAcc.openingDate() == TQDate::currentDate());
} catch(MyMoneyException *e) { } catch(MyMoneyException *e) {
unexpectedException(e); unexpectedException(e);
} }
@ -1509,7 +1509,7 @@ void MyMoneyFileTest::testOpeningBalance(void)
openingAcc = m->openingBalanceAccount(second); openingAcc = m->openingBalanceAccount(second);
CPPUNIT_ASSERT(openingAcc.parentAccountId() == m->equity().id()); CPPUNIT_ASSERT(openingAcc.parentAccountId() == m->equity().id());
CPPUNIT_ASSERT(openingAcc.name() == refName); CPPUNIT_ASSERT(openingAcc.name() == refName);
CPPUNIT_ASSERT(openingAcc.openingDate() == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(openingAcc.openingDate() == TQDate::currentDate());
} catch(MyMoneyException *e) { } catch(MyMoneyException *e) {
unexpectedException(e); unexpectedException(e);
} }

106
kmymoney2/mymoney/mymoneyforecast.cpp
Unescape View File

@ -47,8 +47,8 @@ MyMoneyForecast::MyMoneyForecast() :
{ {
setForecastCycles(KMyMoneyGlobalSettings::forecastCycles()); setForecastCycles(KMyMoneyGlobalSettings::forecastCycles());
setAccountsCycle(KMyMoneyGlobalSettings::forecastAccountCycle()); setAccountsCycle(KMyMoneyGlobalSettings::forecastAccountCycle());
setHistoryStartDate(TQDate::tqcurrentDate().addDays(-forecastCycles()*accountsCycle())); setHistoryStartDate(TQDate::currentDate().addDays(-forecastCycles()*accountsCycle()));
setHistoryEndDate(TQDate::tqcurrentDate().addDays(-1)); setHistoryEndDate(TQDate::currentDate().addDays(-1));
setForecastDays(KMyMoneyGlobalSettings::forecastDays()); setForecastDays(KMyMoneyGlobalSettings::forecastDays());
setBeginForecastDay(KMyMoneyGlobalSettings::beginForecastDay()); setBeginForecastDay(KMyMoneyGlobalSettings::beginForecastDay());
setForecastMethod(KMyMoneyGlobalSettings::forecastMethod()); setForecastMethod(KMyMoneyGlobalSettings::forecastMethod());
@ -75,12 +75,12 @@ void MyMoneyForecast::doForecast()
//initialize global variables //initialize global variables
setForecastDays(fDays); setForecastDays(fDays);
setForecastStartDate(TQDate::tqcurrentDate().addDays(1)); setForecastStartDate(TQDate::currentDate().addDays(1));
setForecastEndDate(TQDate::tqcurrentDate().addDays(fDays)); setForecastEndDate(TQDate::currentDate().addDays(fDays));
setAccountsCycle(fAccCycle); setAccountsCycle(fAccCycle);
setForecastCycles(fCycles); setForecastCycles(fCycles);
setHistoryStartDate(forecastCycles() * accountsCycle()); setHistoryStartDate(forecastCycles() * accountsCycle());
setHistoryEndDate(TQDate::tqcurrentDate().addDays(-1)); //yesterday setHistoryEndDate(TQDate::currentDate().addDays(-1)); //yesterday
//clear all data before calculating //clear all data before calculating
m_accountListPast.clear(); 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 //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 //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); startDate = (acc.openingDate()).addDays(1);
} }
else { else {
startDate = TQDate::tqcurrentDate().addDays(-trendDays); startDate = TQDate::currentDate().addDays(-trendDays);
} }
//get all transactions for the period //get all transactions for the period
filter.setDateFilter(startDate, TQDate::tqcurrentDate()); filter.setDateFilter(startDate, TQDate::currentDate());
if(acc.accountGroup() == MyMoneyAccount::Income if(acc.accountGroup() == MyMoneyAccount::Income
|| acc.accountGroup() == MyMoneyAccount::Expense) { || acc.accountGroup() == MyMoneyAccount::Expense) {
filter.addCategory(acc.id()); filter.addCategory(acc.id());
@ -377,8 +377,8 @@ MyMoneyMoney MyMoneyForecast::calculateAccountTrend(const MyMoneyAccount& acc, i
MyMoneyMoney accTrend; MyMoneyMoney accTrend;
//don't take into account the first day of the account //don't take into account the first day of the account
if(openingDate.daysTo(TQDate::tqcurrentDate())<trendDays) { if(openingDate.daysTo(TQDate::currentDate())<trendDays) {
accTrend = netIncome/MyMoneyMoney(openingDate.daysTo(TQDate::tqcurrentDate())-1,1); accTrend = netIncome/MyMoneyMoney(openingDate.daysTo(TQDate::currentDate())-1,1);
} else { } else {
accTrend = netIncome/MyMoneyMoney(trendDays,1); accTrend = netIncome/MyMoneyMoney(trendDays,1);
} }
@ -490,7 +490,7 @@ void MyMoneyForecast::calculateHistoricDailyBalances()
break; break;
case 2: case 2:
{ {
TQDate baseDate = TQDate::tqcurrentDate().addDays(-accountsCycle()); TQDate baseDate = TQDate::currentDate().addDays(-accountsCycle());
for(int t_day = 1; t_day <= accountsCycle(); ++t_day) { for(int t_day = 1; t_day <= accountsCycle(); ++t_day) {
int f_day = 1; int f_day = 1;
TQDate fDate = baseDate.addDays(accountsCycle()+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 ) MyMoneyMoney MyMoneyForecast::forecastBalance (const MyMoneyAccount& acc, int offset )
{ {
TQDate forecastDate = TQDate::tqcurrentDate().addDays(offset); TQDate forecastDate = TQDate::currentDate().addDays(offset);
return forecastBalance(acc, forecastDate); return forecastBalance(acc, forecastDate);
} }
@ -570,7 +570,7 @@ void MyMoneyForecast::doFutureScheduledForecast(void)
MyMoneyMoney rate = MyMoneyMoney ( 1, 1 ); MyMoneyMoney rate = MyMoneyMoney ( 1, 1 );
MyMoneyPrice price; 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 //get the price for the tradingCurrency that day
price = file->price ( undersecurity.id(), undersecurity.tradingCurrency(), it_day ); price = file->price ( undersecurity.id(), undersecurity.tradingCurrency(), it_day );
if ( price.isValid() ) if ( price.isValid() )
@ -651,7 +651,7 @@ void MyMoneyForecast::addScheduledTransactions (void)
TQValueList<MyMoneySchedule> schedule; TQValueList<MyMoneySchedule> schedule;
schedule = file->scheduleList("", MyMoneySchedule::TYPE_ANY, MyMoneySchedule::OCCUR_ANY, MyMoneySchedule::STYPE_ANY, schedule = file->scheduleList("", MyMoneySchedule::TYPE_ANY, MyMoneySchedule::OCCUR_ANY, MyMoneySchedule::STYPE_ANY,
TQDate::tqcurrentDate(), forecastEndDate()); TQDate::currentDate(), forecastEndDate());
if(schedule.count() > 0) { if(schedule.count() > 0) {
TQValueList<MyMoneySchedule>::Iterator it; TQValueList<MyMoneySchedule>::Iterator it;
do { do {
@ -698,12 +698,12 @@ void MyMoneyForecast::addScheduledTransactions (void)
if(isForecastAccount(acc)) { if(isForecastAccount(acc)) {
// collect all overdues on the first day // collect all overdues on the first day
TQDate forecastDate = nextDate; TQDate forecastDate = nextDate;
if(TQDate::tqcurrentDate() >= nextDate) if(TQDate::currentDate() >= nextDate)
forecastDate = TQDate::tqcurrentDate().addDays(1); forecastDate = TQDate::currentDate().addDays(1);
dailyBalances balance; dailyBalances balance;
balance = m_accountList[acc.id()]; 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]; balanceMap[acc.id()] += m_accountList[acc.id()][f_day];
f_day = f_day.addDays(1); f_day = f_day.addDays(1);
} }
@ -719,14 +719,14 @@ void MyMoneyForecast::addScheduledTransactions (void)
if(isForecastAccount(acc)) { if(isForecastAccount(acc)) {
dailyBalances balance; dailyBalances balance;
balance = m_accountList[acc.id()]; 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 //if(offset <= 0) { // collect all overdues on the first day
// offset = 1; // offset = 1;
//} //}
// collect all overdues on the first day // collect all overdues on the first day
TQDate forecastDate = nextDate; TQDate forecastDate = nextDate;
if(TQDate::tqcurrentDate() >= nextDate) if(TQDate::currentDate() >= nextDate)
forecastDate = TQDate::tqcurrentDate().addDays(1); forecastDate = TQDate::currentDate().addDays(1);
if(acc.accountType() == MyMoneyAccount::Income) { if(acc.accountType() == MyMoneyAccount::Income) {
balance[forecastDate] += ((*it_s).shares() * MyMoneyMoney(-1, 1)); balance[forecastDate] += ((*it_s).shares() * MyMoneyMoney(-1, 1));
@ -807,9 +807,9 @@ int MyMoneyForecast::daysToMinimumBalance(const MyMoneyAccount& acc)
balance = m_accountList[acc.id()]; 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]) { if(minBalance > balance[it_day]) {
return TQDate::tqcurrentDate().daysTo(it_day); return TQDate::currentDate().daysTo(it_day);
} }
it_day = it_day.addDays(1); it_day = it_day.addDays(1);
} }
@ -828,20 +828,20 @@ int MyMoneyForecast::daysToZeroBalance(const MyMoneyAccount& acc)
balance = m_accountList[acc.id()]; balance = m_accountList[acc.id()];
if (acc.accountGroup() == MyMoneyAccount::Asset) { 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 ) ) 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); it_day = it_day.addDays(1);
} }
} else if (acc.accountGroup() == MyMoneyAccount::Liability) { } 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 ) ) 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); it_day = it_day.addDays(1);
} }
@ -882,7 +882,7 @@ MyMoneyMoney MyMoneyForecast::accountTotalVariation(const MyMoneyAccount& acc)
{ {
MyMoneyMoney totalVariation; MyMoneyMoney totalVariation;
totalVariation = forecastBalance(acc, forecastEndDate()) - forecastBalance(acc, TQDate::tqcurrentDate()); totalVariation = forecastBalance(acc, forecastEndDate()) - forecastBalance(acc, TQDate::currentDate());
return totalVariation; return totalVariation;
} }
@ -891,15 +891,15 @@ TQValueList<TQDate> MyMoneyForecast::accountMinimumBalanceDateList(const MyMoney
TQValueList<TQDate> minBalanceList; TQValueList<TQDate> minBalanceList;
int daysToBeginDay; int daysToBeginDay;
daysToBeginDay = TQDate::tqcurrentDate().daysTo(beginForecastDate()); daysToBeginDay = TQDate::currentDate().daysTo(beginForecastDate());
for(int t_cycle = 0; ((t_cycle * accountsCycle()) + daysToBeginDay) < forecastDays() ; ++t_cycle) { for(int t_cycle = 0; ((t_cycle * accountsCycle()) + daysToBeginDay) < forecastDays() ; ++t_cycle) {
MyMoneyMoney minBalance = forecastBalance(acc, (t_cycle * accountsCycle() + daysToBeginDay)); 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) { for(int t_day = 1; t_day <= accountsCycle() ; ++t_day) {
if( minBalance > forecastBalance(acc, (t_cycle * accountsCycle()) + daysToBeginDay + t_day) ) { if( minBalance > forecastBalance(acc, (t_cycle * accountsCycle()) + daysToBeginDay + t_day) ) {
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); minBalanceList.append(minDate);
@ -912,16 +912,16 @@ TQValueList<TQDate> MyMoneyForecast::accountMaximumBalanceDateList(const MyMoney
TQValueList<TQDate> maxBalanceList; TQValueList<TQDate> maxBalanceList;
int daysToBeginDay; int daysToBeginDay;
daysToBeginDay = TQDate::tqcurrentDate().daysTo(beginForecastDate()); daysToBeginDay = TQDate::currentDate().daysTo(beginForecastDate());
for(int t_cycle = 0; ((t_cycle * accountsCycle()) + daysToBeginDay) < forecastDays() ; ++t_cycle) { for(int t_cycle = 0; ((t_cycle * accountsCycle()) + daysToBeginDay) < forecastDays() ; ++t_cycle) {
MyMoneyMoney maxBalance = forecastBalance(acc, ((t_cycle * accountsCycle()) + daysToBeginDay)); 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) { for(int t_day = 0; t_day < accountsCycle() ; ++t_day) {
if( maxBalance < forecastBalance(acc, (t_cycle * accountsCycle()) + daysToBeginDay + t_day) ) { if( maxBalance < forecastBalance(acc, (t_cycle * accountsCycle()) + daysToBeginDay + t_day) ) {
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); maxBalanceList.append(maxDate);
@ -947,38 +947,38 @@ int MyMoneyForecast::calculateBeginForecastDay()
//if 0, beginDate is current date and forecastDays remains unchanged //if 0, beginDate is current date and forecastDays remains unchanged
if(beginDay == 0) { if(beginDay == 0) {
setBeginForecastDate(TQDate::tqcurrentDate()); setBeginForecastDate(TQDate::currentDate());
return fDays; return fDays;
} }
//adjust if beginDay more than days of current month //adjust if beginDay more than days of current month
if(TQDate::tqcurrentDate().daysInMonth() < beginDay) if(TQDate::currentDate().daysInMonth() < beginDay)
beginDay = TQDate::tqcurrentDate().daysInMonth(); beginDay = TQDate::currentDate().daysInMonth();
//if beginDay still to come, calculate and return //if beginDay still to come, calculate and return
if(TQDate::tqcurrentDate().day() <= beginDay) { if(TQDate::currentDate().day() <= beginDay) {
beginDate = TQDate( TQDate::tqcurrentDate().year(), TQDate::tqcurrentDate().month(), beginDay); beginDate = TQDate( TQDate::currentDate().year(), TQDate::currentDate().month(), beginDay);
fDays += TQDate::tqcurrentDate().daysTo(beginDate); fDays += TQDate::currentDate().daysTo(beginDate);
setBeginForecastDate(beginDate); setBeginForecastDate(beginDate);
return fDays; return fDays;
} }
//adjust beginDay for next month //adjust beginDay for next month
if(TQDate::tqcurrentDate().addMonths(1).daysInMonth() < beginDay) if(TQDate::currentDate().addMonths(1).daysInMonth() < beginDay)
beginDay = TQDate::tqcurrentDate().addMonths(1).daysInMonth(); beginDay = TQDate::currentDate().addMonths(1).daysInMonth();
//if beginDay of next month comes before 1 interval, use beginDay next month //if beginDay of next month comes before 1 interval, use beginDay next month
if(TQDate::tqcurrentDate().addDays(accCycle) >= if(TQDate::currentDate().addDays(accCycle) >=
(TQDate(TQDate::tqcurrentDate().addMonths(1).year(), TQDate::tqcurrentDate().addMonths(1).month(), 1).addDays(beginDay-1) ) ) (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); beginDate = TQDate(TQDate::currentDate().addMonths(1).year(), TQDate::currentDate().addMonths(1).month(), 1).addDays(beginDay-1);
fDays += TQDate::tqcurrentDate().daysTo(beginDate); fDays += TQDate::currentDate().daysTo(beginDate);
} }
else //add intervals to current beginDay and take the first after current date else //add intervals to current beginDay and take the first after current date
{ {
beginDay = ((((TQDate::tqcurrentDate().day()-beginDay)/accCycle) + 1) * accCycle) + beginDay; beginDay = ((((TQDate::currentDate().day()-beginDay)/accCycle) + 1) * accCycle) + beginDay;
beginDate = TQDate::tqcurrentDate().addDays(beginDay - TQDate::tqcurrentDate().day()); beginDate = TQDate::currentDate().addDays(beginDay - TQDate::currentDate().day());
fDays += TQDate::tqcurrentDate().daysTo(beginDate); fDays += TQDate::currentDate().daysTo(beginDate);
} }
setBeginForecastDate(beginDate); setBeginForecastDate(beginDate);
@ -1190,15 +1190,15 @@ void MyMoneyForecast::setStartingBalance(const MyMoneyAccount &acc)
//set the default value //set the default value
MyMoneyMoney rate = MyMoneyMoney ( 1, 1 ); MyMoneyMoney rate = MyMoneyMoney ( 1, 1 );
//get te //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() ) if ( price.isValid() )
{ {
rate = price.rate ( undersecurity.tradingCurrency() ); 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 { } 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 //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 // the payment is overdue then take the current date
dueDate = schedule.nextDueDate(); dueDate = schedule.nextDueDate();
if(acc.interestCalculation() == MyMoneyAccountLoan::paymentReceived) { if(acc.interestCalculation() == MyMoneyAccountLoan::paymentReceived) {
if(dueDate < TQDate::tqcurrentDate()) if(dueDate < TQDate::currentDate())
dueDate = TQDate::tqcurrentDate(); dueDate = TQDate::currentDate();
} }
// we need to calculate the balance at the time the payment is due // we need to calculate the balance at the time the payment is due

4
kmymoney2/mymoney/mymoneyforecast.h
Unescape View File

@ -141,8 +141,8 @@ public:
void setForecastMethod(int forecastMethod) { m_forecastMethod = forecastMethod; } void setForecastMethod(int forecastMethod) { m_forecastMethod = forecastMethod; }
void setHistoryStartDate(TQDate historyStartDate) { m_historyStartDate = historyStartDate; } void setHistoryStartDate(TQDate historyStartDate) { m_historyStartDate = historyStartDate; }
void setHistoryEndDate(TQDate historyEndDate) { m_historyEndDate = historyEndDate; } void setHistoryEndDate(TQDate historyEndDate) { m_historyEndDate = historyEndDate; }
void setHistoryStartDate(int daysToStartDate) { setHistoryStartDate(TQDate::tqcurrentDate().addDays(-daysToStartDate)); } void setHistoryStartDate(int daysToStartDate) { setHistoryStartDate(TQDate::currentDate().addDays(-daysToStartDate)); }
void setHistoryEndDate(int daysToEndDate) { setHistoryEndDate(TQDate::tqcurrentDate().addDays(-daysToEndDate)); } void setHistoryEndDate(int daysToEndDate) { setHistoryEndDate(TQDate::currentDate().addDays(-daysToEndDate)); }
void setForecastStartDate(TQDate _startDate) { m_forecastStartDate = _startDate; } void setForecastStartDate(TQDate _startDate) { m_forecastStartDate = _startDate; }
void setForecastEndDate(TQDate _endDate) { m_forecastEndDate = _endDate; } void setForecastEndDate(TQDate _endDate) { m_forecastEndDate = _endDate; }
void setSkipOpeningDate(bool _skip) { m_skipOpeningDate = _skip; } void setSkipOpeningDate(bool _skip) { m_skipOpeningDate = _skip; }

270
kmymoney2/mymoney/mymoneyforecasttest.cpp
Unescape View File

@ -78,7 +78,7 @@ void MyMoneyForecastTest::setUp () {
acGrandChild2 = makeAccount(TQString("Grand Child 2"),MyMoneyAccount::Expense,0,TQDate(2004,2,11),acChild, "USD"); 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 //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","","","","","",""); MyMoneyInstitution i("Bank of the World","","","","","","");
@ -97,18 +97,18 @@ void MyMoneyForecastTest::testEmptyConstructor() {
MyMoneyForecast a; MyMoneyForecast a;
MyMoneyAccount b; MyMoneyAccount b;
int f = a.forecastBalance(b, TQDate::tqcurrentDate()); int f = a.forecastBalance(b, TQDate::currentDate());
CPPUNIT_ASSERT(f == 0); CPPUNIT_ASSERT(f == 0);
CPPUNIT_ASSERT(!a.isForecastAccount(b)); 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.daysToMinimumBalance(b) == -1);
CPPUNIT_ASSERT(a.daysToZeroBalance(b) == -2); CPPUNIT_ASSERT(a.daysToZeroBalance(b) == -2);
CPPUNIT_ASSERT(a.forecastDays() == KMyMoneyGlobalSettings::forecastDays()); CPPUNIT_ASSERT(a.forecastDays() == KMyMoneyGlobalSettings::forecastDays());
CPPUNIT_ASSERT(a.accountsCycle() == KMyMoneyGlobalSettings::forecastAccountCycle()); CPPUNIT_ASSERT(a.accountsCycle() == KMyMoneyGlobalSettings::forecastAccountCycle());
CPPUNIT_ASSERT(a.forecastCycles() == KMyMoneyGlobalSettings::forecastCycles()); CPPUNIT_ASSERT(a.forecastCycles() == KMyMoneyGlobalSettings::forecastCycles());
CPPUNIT_ASSERT(a.historyStartDate() == TQDate::tqcurrentDate().addDays(-KMyMoneyGlobalSettings::forecastCycles()*KMyMoneyGlobalSettings::forecastAccountCycle())); CPPUNIT_ASSERT(a.historyStartDate() == TQDate::currentDate().addDays(-KMyMoneyGlobalSettings::forecastCycles()*KMyMoneyGlobalSettings::forecastAccountCycle()));
CPPUNIT_ASSERT(a.historyEndDate() == TQDate::tqcurrentDate().addDays(-1)); CPPUNIT_ASSERT(a.historyEndDate() == TQDate::currentDate().addDays(-1));
CPPUNIT_ASSERT(a.historyDays() == KMyMoneyGlobalSettings::forecastAccountCycle() * KMyMoneyGlobalSettings::forecastCycles()); 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 a.doForecast(); //this is just to check nothing goes wrong if forecast is run agains an empty template
//setup some transactions //setup some transactions
TransactionHelper t1( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT1, acChecking, acSolo); TransactionHelper t1( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT1, acChecking, acSolo);
TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionDeposit, -(this->moT2), acCredit, acParent); TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionDeposit, -(this->moT2), acCredit, acParent);
TransactionHelper t3( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionTransfer, this->moT1, acCredit, acChecking); TransactionHelper t3( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionTransfer, this->moT1, acCredit, acChecking);
a.setForecastMethod(1); a.setForecastMethod(1);
a.setForecastDays(3); a.setForecastDays(3);
@ -190,32 +190,32 @@ void MyMoneyForecastTest::testDoForecast() {
a.doForecast(); a.doForecast();
//checking didn't have balance variations, so the forecast should be equal to the current balance //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::currentDate().addDays(1))==b_checking);
CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::tqcurrentDate().addDays(2))==b_checking); CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::currentDate().addDays(2))==b_checking);
CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::tqcurrentDate().addDays(3))==b_checking); CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::currentDate().addDays(3))==b_checking);
CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::tqcurrentDate())==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 //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, 0) == b_credit);
CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(1)) == (b_credit+(moT2-moT1))); CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().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::currentDate().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(3)) == b_credit+((moT2-moT1)*3));
a.setHistoryMethod(1); //weighted moving average a.setHistoryMethod(1); //weighted moving average
a.doForecast(); a.doForecast();
CPPUNIT_ASSERT(a.forecastBalance(a_credit, 0) == b_credit); 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::currentDate().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::currentDate().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(3)) == b_credit+((moT2-moT1)*3));
//insert transactions outside the forecast period. The calculation should be the same. //insert transactions outside the forecast period. The calculation should be the same.
TransactionHelper t4( TQDate::tqcurrentDate().addDays(-2), MyMoneySplit::ActionDeposit, -moT2, acCredit, acParent ); TransactionHelper t4( TQDate::currentDate().addDays(-2), MyMoneySplit::ActionDeposit, -moT2, acCredit, acParent );
TransactionHelper t5( TQDate::tqcurrentDate().addDays(-10), MyMoneySplit::ActionDeposit, -moT2, acCredit, acParent ); TransactionHelper t5( TQDate::currentDate().addDays(-10), MyMoneySplit::ActionDeposit, -moT2, acCredit, acParent );
TransactionHelper t6( TQDate::tqcurrentDate().addDays(-3), MyMoneySplit::ActionDeposit, -moT2, acCredit, acParent ); TransactionHelper t6( TQDate::currentDate().addDays(-3), MyMoneySplit::ActionDeposit, -moT2, acCredit, acParent );
a.setForecastMethod(1); a.setForecastMethod(1);
a.setForecastDays(3); a.setForecastDays(3);
@ -225,14 +225,14 @@ void MyMoneyForecastTest::testDoForecast() {
a.setHistoryMethod(0); //moving average a.setHistoryMethod(0); //moving average
a.doForecast(); a.doForecast();
//check forecast //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_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)); 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::currentDate())==file->balance(a_credit.id(), TQDate::currentDate()));
CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(1))==b_credit+(moT2-moT1)); CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().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::currentDate().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(3))==b_credit+((moT2-moT1)*3));
//test weighted moving average //test weighted moving average
a.setForecastMethod(1); a.setForecastMethod(1);
@ -244,7 +244,7 @@ void MyMoneyForecastTest::testDoForecast() {
a.doForecast(); a.doForecast();
CPPUNIT_ASSERT(a.forecastBalance(a_credit, 0) == b_credit); 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() void MyMoneyForecastTest::testCalculateAccountTrend()
{ {
//set up environment //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); MyMoneyAccount a_checking = file->account(acChecking);
//test invalid arguments //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 //test that it does not take into account the transactions of the opening date of the account
MyMoneyAccount a_cash = file->account(acCash); MyMoneyAccount a_cash = file->account(acCash);
TransactionHelper t2( TQDate::tqcurrentDate().addDays(-2), MyMoneySplit::ActionDeposit, moT2, acCash, acParent ); TransactionHelper t2( TQDate::currentDate().addDays(-2), MyMoneySplit::ActionDeposit, moT2, acCash, acParent );
TransactionHelper t3( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionDeposit, moT1, acCash, acParent ); TransactionHelper t3( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionDeposit, moT1, acCash, acParent );
CPPUNIT_ASSERT(MyMoneyForecast::calculateAccountTrend(a_cash,3) == -moT1); CPPUNIT_ASSERT(MyMoneyForecast::calculateAccountTrend(a_cash,3) == -moT1);
} }
@ -307,9 +307,9 @@ void MyMoneyForecastTest::testGetForecastBalance()
//set up environment //set up environment
MyMoneyForecast a; MyMoneyForecast a;
TransactionHelper t1( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT1, acChecking, acSolo); TransactionHelper t1( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT1, acChecking, acSolo);
TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionDeposit, -(this->moT2), acCredit, acParent); TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionDeposit, -(this->moT2), acCredit, acParent);
TransactionHelper t3( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionTransfer, this->moT1, acCredit, acChecking); TransactionHelper t3( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionTransfer, this->moT1, acCredit, acChecking);
a.setForecastMethod(1); a.setForecastMethod(1);
a.setForecastDays(3); a.setForecastDays(3);
@ -322,23 +322,23 @@ void MyMoneyForecastTest::testGetForecastBalance()
MyMoneyAccount a_credit = file->account(acCredit); MyMoneyAccount a_credit = file->account(acCredit);
//test invalid arguments //test invalid arguments
CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::tqcurrentDate().addDays(-1))==MyMoneyMoney(0,1)); CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::currentDate().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(-10))==MyMoneyMoney(0,1));
CPPUNIT_ASSERT(a.forecastBalance(a_checking, -1)==MyMoneyMoney(0,1)); CPPUNIT_ASSERT(a.forecastBalance(a_checking, -1)==MyMoneyMoney(0,1));
CPPUNIT_ASSERT(a.forecastBalance(a_checking, -100)==MyMoneyMoney(0,1)); CPPUNIT_ASSERT(a.forecastBalance(a_checking, -100)==MyMoneyMoney(0,1));
//test a date outside the forecast days //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, 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)); CPPUNIT_ASSERT(a.forecastBalance(a_checking, 10)==MyMoneyMoney(0,1));
//test it returns valid results //test it returns valid results
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, TQDate::tqcurrentDate())==file->balance(a_credit.id(), TQDate::tqcurrentDate())); CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate())==file->balance(a_credit.id(), TQDate::currentDate()));
CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(1))==b_credit+(moT2-moT1)); CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().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::currentDate().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(3))==b_credit+((moT2-moT1)*3));
} }
void MyMoneyForecastTest::testIsForecastAccount() void MyMoneyForecastTest::testIsForecastAccount()
@ -364,10 +364,10 @@ void MyMoneyForecastTest::testDoFutureScheduledForecast()
MyMoneyForecast a; MyMoneyForecast a;
MyMoneyAccount a_cash = file->account(acCash); MyMoneyAccount a_cash = file->account(acCash);
TransactionHelper t1( TQDate::tqcurrentDate().addDays(1), MyMoneySplit::ActionDeposit, -moT1, acCash, acParent ); TransactionHelper t1( TQDate::currentDate().addDays(1), MyMoneySplit::ActionDeposit, -moT1, acCash, acParent );
TransactionHelper t2( TQDate::tqcurrentDate().addDays(2), MyMoneySplit::ActionDeposit, -moT2, acCash, acParent ); TransactionHelper t2( TQDate::currentDate().addDays(2), MyMoneySplit::ActionDeposit, -moT2, acCash, acParent );
TransactionHelper t3( TQDate::tqcurrentDate().addDays(3), MyMoneySplit::ActionDeposit, -moT3, acCash, acParent ); TransactionHelper t3( TQDate::currentDate().addDays(3), MyMoneySplit::ActionDeposit, -moT3, acCash, acParent );
TransactionHelper t4( TQDate::tqcurrentDate().addDays(10), MyMoneySplit::ActionDeposit, -moT4, acCash, acParent ); TransactionHelper t4( TQDate::currentDate().addDays(10), MyMoneySplit::ActionDeposit, -moT4, acCash, acParent );
a.setForecastMethod(0); a.setForecastMethod(0);
a.setForecastDays(3); a.setForecastDays(3);
@ -375,13 +375,13 @@ void MyMoneyForecastTest::testDoFutureScheduledForecast()
a.setForecastCycles(1); a.setForecastCycles(1);
a.doForecast(); 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 //test valid results
CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate())==b_cash); CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate())==b_cash);
CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(1))==b_cash+moT1); CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate().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::currentDate().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().addDays(3))==b_cash+moT1+moT2+moT3);
} }
void MyMoneyForecastTest::testScheduleForecast() void MyMoneyForecastTest::testScheduleForecast()
@ -395,14 +395,14 @@ void MyMoneyForecastTest::testScheduleForecast()
MyMoneySchedule::TYPE_BILL, MyMoneySchedule::TYPE_BILL,
MyMoneySchedule::OCCUR_WEEKLY, 1, MyMoneySchedule::OCCUR_WEEKLY, 1,
MyMoneySchedule::STYPE_DIRECTDEBIT, MyMoneySchedule::STYPE_DIRECTDEBIT,
TQDate::tqcurrentDate().addDays(1), TQDate::currentDate().addDays(1),
TQDate(), TQDate(),
true, true,
true); true);
MyMoneyTransaction t; MyMoneyTransaction t;
t.setPostDate(TQDate::tqcurrentDate().addDays(1)); t.setPostDate(TQDate::currentDate().addDays(1));
t.setEntryDate(TQDate::tqcurrentDate().addDays(1)); t.setEntryDate(TQDate::currentDate().addDays(1));
//t.setId("T000000000000000001"); //t.setId("T000000000000000001");
t.setBankID("BID"); t.setBankID("BID");
t.setMemo("Wohnung:Miete"); t.setMemo("Wohnung:Miete");
@ -437,18 +437,18 @@ void MyMoneyForecastTest::testScheduleForecast()
MyMoneySchedule::TYPE_BILL, MyMoneySchedule::TYPE_BILL,
MyMoneySchedule::OCCUR_WEEKLY, 1, MyMoneySchedule::OCCUR_WEEKLY, 1,
MyMoneySchedule::STYPE_DIRECTDEBIT, MyMoneySchedule::STYPE_DIRECTDEBIT,
TQDate::tqcurrentDate().addDays(5), TQDate::currentDate().addDays(5),
TQDate(), TQDate(),
true, true,
true); true);
//sch.setLastPayment(TQDate::tqcurrentDate()); //sch.setLastPayment(TQDate::currentDate());
//sch.recordPayment(TQDate::tqcurrentDate().addDays(1)); //sch.recordPayment(TQDate::currentDate().addDays(1));
//sch.setId("SCH0001"); //sch.setId("SCH0001");
MyMoneyTransaction t3; MyMoneyTransaction t3;
t3.setPostDate(TQDate::tqcurrentDate().addDays(5)); t3.setPostDate(TQDate::currentDate().addDays(5));
t3.setEntryDate(TQDate::tqcurrentDate().addDays(5)); t3.setEntryDate(TQDate::currentDate().addDays(5));
//t.setId("T000000000000000001"); //t.setId("T000000000000000001");
t3.setBankID("BID"); t3.setBankID("BID");
t3.setMemo("Wohnung:Miete"); t3.setMemo("Wohnung:Miete");
@ -484,18 +484,18 @@ void MyMoneyForecastTest::testScheduleForecast()
MyMoneySchedule::TYPE_BILL, MyMoneySchedule::TYPE_BILL,
MyMoneySchedule::OCCUR_WEEKLY, 1, MyMoneySchedule::OCCUR_WEEKLY, 1,
MyMoneySchedule::STYPE_DIRECTDEBIT, MyMoneySchedule::STYPE_DIRECTDEBIT,
TQDate::tqcurrentDate().addDays(2), TQDate::currentDate().addDays(2),
TQDate(), TQDate(),
true, true,
true); true);
//sch.setLastPayment(TQDate::tqcurrentDate()); //sch.setLastPayment(TQDate::currentDate());
//sch.recordPayment(TQDate::tqcurrentDate().addDays(1)); //sch.recordPayment(TQDate::currentDate().addDays(1));
//sch.setId("SCH0001"); //sch.setId("SCH0001");
MyMoneyTransaction t2; MyMoneyTransaction t2;
t2.setPostDate(TQDate::tqcurrentDate().addDays(2)); t2.setPostDate(TQDate::currentDate().addDays(2));
t2.setEntryDate(TQDate::tqcurrentDate().addDays(2)); t2.setEntryDate(TQDate::currentDate().addDays(2));
//t.setId("T000000000000000001"); //t.setId("T000000000000000001");
t2.setBankID("BID"); t2.setBankID("BID");
t2.setMemo("Wohnung:Miete"); t2.setMemo("Wohnung:Miete");
@ -535,13 +535,13 @@ void MyMoneyForecastTest::testScheduleForecast()
a.doForecast(); a.doForecast();
//check result for single schedule //check result for single schedule
MyMoneyMoney b_cash = file->balance(a_cash.id(), TQDate::tqcurrentDate()); MyMoneyMoney b_cash = file->balance(a_cash.id(), TQDate::currentDate());
MyMoneyMoney b_cash1 = a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(1)); MyMoneyMoney b_cash1 = a.forecastBalance(a_cash, TQDate::currentDate().addDays(1));
//test valid results //test valid results
CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate())==b_cash); CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate())==b_cash);
CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(1))==b_cash-moT2); CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate().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().addDays(2))==b_cash-moT2-moT1);
} }
@ -555,10 +555,10 @@ void MyMoneyForecastTest::testDaysToMinimumBalance()
MyMoneyAccount a_parent = file->account(acParent); MyMoneyAccount a_parent = file->account(acParent);
a_cash.setValue("minBalanceAbsolute", "50"); a_cash.setValue("minBalanceAbsolute", "50");
a_credit.setValue("minBalanceAbsolute", "50"); a_credit.setValue("minBalanceAbsolute", "50");
TransactionHelper t1( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionDeposit, -moT1, acCash, acParent ); TransactionHelper t1( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionDeposit, -moT1, acCash, acParent );
TransactionHelper t2( TQDate::tqcurrentDate().addDays(2), MyMoneySplit::ActionDeposit, moT2, acCash, acParent ); TransactionHelper t2( TQDate::currentDate().addDays(2), MyMoneySplit::ActionDeposit, moT2, acCash, acParent );
TransactionHelper t3( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, -moT1, acCredit, acParent ); TransactionHelper t3( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, -moT1, acCredit, acParent );
TransactionHelper t4( TQDate::tqcurrentDate().addDays(4), MyMoneySplit::ActionWithdrawal, moT5, acCredit, acParent ); TransactionHelper t4( TQDate::currentDate().addDays(4), MyMoneySplit::ActionWithdrawal, moT5, acCredit, acParent );
a.setForecastMethod(0); a.setForecastMethod(0);
a.setForecastDays(3); a.setForecastDays(3);
@ -588,9 +588,9 @@ void MyMoneyForecastTest::testDaysToZeroBalance()
MyMoneyAccount a_Credit = file->account(acCredit); MyMoneyAccount a_Credit = file->account(acCredit);
//MyMoneyFileTransaction ft; //MyMoneyFileTransaction ft;
TransactionHelper t1( TQDate::tqcurrentDate().addDays(2), MyMoneySplit::ActionWithdrawal, -moT1, acChecking, acSolo ); TransactionHelper t1( TQDate::currentDate().addDays(2), MyMoneySplit::ActionWithdrawal, -moT1, acChecking, acSolo );
TransactionHelper t2( TQDate::tqcurrentDate().addDays(2), MyMoneySplit::ActionTransfer, (moT5), acCash, acCredit ); TransactionHelper t2( TQDate::currentDate().addDays(2), MyMoneySplit::ActionTransfer, (moT5), acCash, acCredit );
TransactionHelper t3( TQDate::tqcurrentDate().addDays(2), MyMoneySplit::ActionWithdrawal, (moT5*100), acCredit, acParent ); TransactionHelper t3( TQDate::currentDate().addDays(2), MyMoneySplit::ActionWithdrawal, (moT5*100), acCredit, acParent );
//ft.commit(); //ft.commit();
MyMoneyForecast a; MyMoneyForecast a;
@ -618,7 +618,7 @@ void MyMoneyForecastTest::testDaysToZeroBalance()
//test it warns when inside the forecast period //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); CPPUNIT_ASSERT(a.daysToZeroBalance(a_Cash) == 2);
@ -631,8 +631,8 @@ void MyMoneyForecastTest::testSkipOpeningDate()
//set up environment //set up environment
MyMoneyForecast a; MyMoneyForecast a;
TransactionHelper t1( TQDate::tqcurrentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo); TransactionHelper t1( TQDate::currentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo);
TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo); TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo);
a.setForecastMethod(1); a.setForecastMethod(1);
a.setForecastDays(3); a.setForecastDays(3);
@ -644,12 +644,12 @@ void MyMoneyForecastTest::testSkipOpeningDate()
MyMoneyAccount a_cash = file->account(acCash); MyMoneyAccount a_cash = file->account(acCash);
//test it has no variation because it skipped the variation of the opening date //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.skipOpeningDate() == true);
CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate())==b_cash); CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate())==b_cash);
CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(1))==b_cash); CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate().addDays(1))==b_cash);
CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(2))==b_cash-moT2); CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate().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().addDays(3))==b_cash-moT2);
} }
void MyMoneyForecastTest::testAccountMinimumBalanceDateList() { void MyMoneyForecastTest::testAccountMinimumBalanceDateList() {
@ -657,15 +657,15 @@ void MyMoneyForecastTest::testAccountMinimumBalanceDateList() {
//set up environment //set up environment
MyMoneyForecast a; MyMoneyForecast a;
TransactionHelper t1( TQDate::tqcurrentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo); TransactionHelper t1( TQDate::currentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo);
TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo); TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo);
a.setForecastMethod(1); a.setForecastMethod(1);
a.setForecastDays(6); a.setForecastDays(6);
a.setAccountsCycle(2); a.setAccountsCycle(2);
a.setForecastCycles(3); a.setForecastCycles(3);
a.setHistoryMethod(0); a.setHistoryMethod(0);
a.setBeginForecastDay(TQDate::tqcurrentDate().addDays(1).day()); a.setBeginForecastDay(TQDate::currentDate().addDays(1).day());
a.doForecast(); a.doForecast();
MyMoneyAccount a_cash = file->account(acCash); MyMoneyAccount a_cash = file->account(acCash);
@ -678,13 +678,13 @@ void MyMoneyForecastTest::testAccountMinimumBalanceDateList() {
TQDate minDate = *it; TQDate minDate = *it;
CPPUNIT_ASSERT(minDate==TQDate::tqcurrentDate().addDays(2)); CPPUNIT_ASSERT(minDate==TQDate::currentDate().addDays(2));
it++; it++;
minDate = *it; minDate = *it;
CPPUNIT_ASSERT(minDate==TQDate::tqcurrentDate().addDays(4)); CPPUNIT_ASSERT(minDate==TQDate::currentDate().addDays(4));
it++; it++;
minDate = *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 //set up environment
MyMoneyForecast a; MyMoneyForecast a;
TransactionHelper t1( TQDate::tqcurrentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo); TransactionHelper t1( TQDate::currentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo);
TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo); TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo);
a.setForecastMethod(1); a.setForecastMethod(1);
a.setForecastDays(6); a.setForecastDays(6);
a.setAccountsCycle(2); a.setAccountsCycle(2);
a.setForecastCycles(3); a.setForecastCycles(3);
a.setHistoryMethod(0); a.setHistoryMethod(0);
a.setBeginForecastDay(TQDate::tqcurrentDate().addDays(1).day()); a.setBeginForecastDay(TQDate::currentDate().addDays(1).day());
a.doForecast(); a.doForecast();
MyMoneyAccount a_cash = file->account(acCash); MyMoneyAccount a_cash = file->account(acCash);
@ -713,13 +713,13 @@ void MyMoneyForecastTest::testAccountMaximumBalanceDateList() {
TQDate maxDate = *it; TQDate maxDate = *it;
CPPUNIT_ASSERT(maxDate==TQDate::tqcurrentDate().addDays(1)); CPPUNIT_ASSERT(maxDate==TQDate::currentDate().addDays(1));
it++; it++;
maxDate = *it; maxDate = *it;
CPPUNIT_ASSERT(maxDate==TQDate::tqcurrentDate().addDays(3)); CPPUNIT_ASSERT(maxDate==TQDate::currentDate().addDays(3));
it++; it++;
maxDate = *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 //set up environment
MyMoneyForecast a; MyMoneyForecast a;
TransactionHelper t1( TQDate::tqcurrentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo); TransactionHelper t1( TQDate::currentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo);
TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo); TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo);
a.setForecastMethod(1); a.setForecastMethod(1);
a.setForecastDays(3); a.setForecastDays(3);
@ -741,9 +741,9 @@ void MyMoneyForecastTest::testAccountAverageBalance() {
MyMoneyAccount a_cash = file->account(acCash); MyMoneyAccount a_cash = file->account(acCash);
//test //test
MyMoneyMoney b_cash1 = a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(1)); MyMoneyMoney b_cash1 = a.forecastBalance(a_cash, TQDate::currentDate().addDays(1));
MyMoneyMoney b_cash2 = a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(2)); MyMoneyMoney b_cash2 = a.forecastBalance(a_cash, TQDate::currentDate().addDays(2));
MyMoneyMoney b_cash3 = a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(3)); MyMoneyMoney b_cash3 = a.forecastBalance(a_cash, TQDate::currentDate().addDays(3));
MyMoneyMoney average = (b_cash1 + b_cash2 +b_cash3)/MyMoneyMoney(3,1); MyMoneyMoney average = (b_cash1 + b_cash2 +b_cash3)/MyMoneyMoney(3,1);
@ -765,7 +765,7 @@ void MyMoneyForecastTest::testBeginForecastDate() {
a.doForecast(); a.doForecast();
//test when using old method without begin day //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 //setup begin to last day of month
a.setBeginForecastDay(31); a.setBeginForecastDay(31);
@ -773,22 +773,22 @@ void MyMoneyForecastTest::testBeginForecastDate() {
a.doForecast(); a.doForecast();
//test //test
if(TQDate::tqcurrentDate().day() < beginDay) if(TQDate::currentDate().day() < beginDay)
{ {
if(TQDate::tqcurrentDate().daysInMonth() < beginDay) if(TQDate::currentDate().daysInMonth() < beginDay)
beginDay = TQDate::tqcurrentDate().daysInMonth(); 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()); CPPUNIT_ASSERT(beginDate == a.beginForecastDate());
} }
//setup begin day to same date //setup begin day to same date
a.setBeginForecastDay(TQDate::tqcurrentDate().day()); a.setBeginForecastDay(TQDate::currentDate().day());
beginDay = a.beginForecastDay(); beginDay = a.beginForecastDay();
a.doForecast(); a.doForecast();
CPPUNIT_ASSERT(TQDate::tqcurrentDate() == a.beginForecastDate()); CPPUNIT_ASSERT(TQDate::currentDate() == a.beginForecastDate());
//setup to first day of month with small interval //setup to first day of month with small interval
a.setBeginForecastDay(1); a.setBeginForecastDay(1);
@ -797,14 +797,14 @@ void MyMoneyForecastTest::testBeginForecastDate() {
a.doForecast(); a.doForecast();
//test //test
if(TQDate::tqcurrentDate() == a.beginForecastDate()) { if(TQDate::currentDate() == a.beginForecastDate()) {
CPPUNIT_ASSERT(TQDate::tqcurrentDate() == a.beginForecastDate()); CPPUNIT_ASSERT(TQDate::currentDate() == a.beginForecastDate());
} else { } else {
beginDay = ((((TQDate::tqcurrentDate().day() - beginDay)/a.accountsCycle()) + 1) * a.accountsCycle()) + beginDay; beginDay = ((((TQDate::currentDate().day() - beginDay)/a.accountsCycle()) + 1) * a.accountsCycle()) + beginDay;
if(beginDay > TQDate::tqcurrentDate().daysInMonth()) if(beginDay > TQDate::currentDate().daysInMonth())
beginDay = TQDate::tqcurrentDate().daysInMonth(); beginDay = TQDate::currentDate().daysInMonth();
beginDate = TQDate(TQDate::tqcurrentDate().year(), TQDate::tqcurrentDate().month(), beginDay); beginDate = TQDate(TQDate::currentDate().year(), TQDate::currentDate().month(), beginDay);
if(TQDate::tqcurrentDate().day() == TQDate::tqcurrentDate().daysInMonth() ) { 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; 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 { } else {
CPPUNIT_ASSERT(beginDate == a.beginForecastDate()); CPPUNIT_ASSERT(beginDate == a.beginForecastDate());
@ -813,9 +813,9 @@ void MyMoneyForecastTest::testBeginForecastDate() {
//setup to test when current date plus cycle equals begin day //setup to test when current date plus cycle equals begin day
a.setAccountsCycle(14); a.setAccountsCycle(14);
beginDay = TQDate::tqcurrentDate().addDays(14).day(); beginDay = TQDate::currentDate().addDays(14).day();
a.setBeginForecastDay(beginDay); a.setBeginForecastDay(beginDay);
beginDate = TQDate::tqcurrentDate().addDays(14); beginDate = TQDate::currentDate().addDays(14);
a.doForecast(); a.doForecast();
//test //test
@ -826,10 +826,10 @@ void MyMoneyForecastTest::testBeginForecastDate() {
a.setAccountsCycle(40); a.setAccountsCycle(40);
a.doForecast(); 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 //test
if(TQDate::tqcurrentDate().day() > 1) { if(TQDate::currentDate().day() > 1) {
CPPUNIT_ASSERT(beginDate == a.beginForecastDate()); CPPUNIT_ASSERT(beginDate == a.beginForecastDate());
} else { } else {
//test is not valid if today is 1st of month //test is not valid if today is 1st of month
@ -841,8 +841,8 @@ void MyMoneyForecastTest::testBeginForecastDate() {
{ {
MyMoneyForecast a; MyMoneyForecast a;
CPPUNIT_ASSERT(a.historyStartDate() == TQDate::tqcurrentDate().addDays(-a.forecastCycles()*a.accountsCycle()) ); CPPUNIT_ASSERT(a.historyStartDate() == TQDate::currentDate().addDays(-a.forecastCycles()*a.accountsCycle()) );
CPPUNIT_ASSERT(a.historyEndDate() == TQDate::tqcurrentDate().addDays(-1) ); CPPUNIT_ASSERT(a.historyEndDate() == TQDate::currentDate().addDays(-1) );
CPPUNIT_ASSERT(a.historyDays() == a.forecastCycles()*a.accountsCycle()); CPPUNIT_ASSERT(a.historyDays() == a.forecastCycles()*a.accountsCycle());
a.setForecastMethod(1); a.setForecastMethod(1);
@ -852,9 +852,9 @@ void MyMoneyForecastTest::testBeginForecastDate() {
a.setBeginForecastDay(0); a.setBeginForecastDay(0);
a.doForecast(); 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.historyDays() == (14*3));
CPPUNIT_ASSERT(a.historyEndDate() == (TQDate::tqcurrentDate().addDays(-1)) ); CPPUNIT_ASSERT(a.historyEndDate() == (TQDate::currentDate().addDays(-1)) );
} }
void MyMoneyForecastTest::testCreateBudget() void MyMoneyForecastTest::testCreateBudget()
@ -910,14 +910,14 @@ void MyMoneyForecastTest::testCreateBudget()
MyMoneySchedule::TYPE_BILL, MyMoneySchedule::TYPE_BILL,
MyMoneySchedule::OCCUR_MONTHLY, 1, MyMoneySchedule::OCCUR_MONTHLY, 1,
MyMoneySchedule::STYPE_DIRECTDEBIT, MyMoneySchedule::STYPE_DIRECTDEBIT,
TQDate::tqcurrentDate(), TQDate::currentDate(),
TQDate(), TQDate(),
true, true,
true); true);
MyMoneyTransaction t10; MyMoneyTransaction t10;
t10.setPostDate(TQDate::tqcurrentDate().addMonths(1)); t10.setPostDate(TQDate::currentDate().addMonths(1));
t10.setEntryDate(TQDate::tqcurrentDate().addMonths(1)); t10.setEntryDate(TQDate::currentDate().addMonths(1));
//t.setId("T000000000000000001"); //t.setId("T000000000000000001");
t10.setBankID("BID"); t10.setBankID("BID");
t10.setMemo("Wohnung:Miete"); t10.setMemo("Wohnung:Miete");
@ -951,12 +951,12 @@ void MyMoneyForecastTest::testCreateBudget()
MyMoneyForecast c; MyMoneyForecast c;
c.setForecastMethod(0); c.setForecastMethod(0);
c.setForecastCycles(1); 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 //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() { void MyMoneyForecastTest::testLinearRegression() {
@ -967,9 +967,9 @@ void MyMoneyForecastTest::testLinearRegression() {
MyMoneyAccount a_credit = file->account(acCredit); MyMoneyAccount a_credit = file->account(acCredit);
//setup some transactions //setup some transactions
TransactionHelper t1( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT1, acChecking, acSolo); TransactionHelper t1( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT1, acChecking, acSolo);
TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionDeposit, -(this->moT2), acCredit, acParent); TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionDeposit, -(this->moT2), acCredit, acParent);
TransactionHelper t3( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionTransfer, this->moT1, acCredit, acChecking); TransactionHelper t3( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionTransfer, this->moT1, acCredit, acChecking);
//TODO Add tests specific for linear regression //TODO Add tests specific for linear regression

4
kmymoney2/mymoney/mymoneyreport.cpp
Unescape View File

@ -201,8 +201,8 @@ void MyMoneyReport::validDateRange ( TQDate& _db, TQDate& _de )
tmpBegin = list.front().postDate(); tmpBegin = list.front().postDate();
tmpEnd = list.back().postDate(); tmpEnd = list.back().postDate();
} else { } else {
tmpBegin = TQDate ( TQDate::tqcurrentDate().year(), 1, 1 ); // the first date in the file tmpBegin = TQDate ( TQDate::currentDate().year(), 1, 1 ); // the first date in the file
tmpEnd = TQDate ( TQDate::tqcurrentDate().year(), 12, 31 );// the last date in the file tmpEnd = TQDate ( TQDate::currentDate().year(), 12, 31 );// the last date in the file
} }
if ( !_db.isValid() ) if ( !_db.isValid() )
_db = tmpBegin; _db = tmpBegin;

2
kmymoney2/mymoney/mymoneyscheduled.cpp
Unescape View File

@ -680,7 +680,7 @@ bool MyMoneySchedule::isOverdue() const
if (isFinished()) if (isFinished())
return false; return false;
if(adjustedNextDueDate() >= TQDate::tqcurrentDate()) if(adjustedNextDueDate() >= TQDate::currentDate())
return false; return false;
return true; return true;

4
kmymoney2/mymoney/mymoneyscheduled.h
Unescape View File

@ -409,7 +409,7 @@ public:
* are no more payments then an empty/invalid TQDate() will * are no more payments then an empty/invalid TQDate() will
* be returned. * 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. * Calculates the date of the next payment.
@ -422,7 +422,7 @@ public:
* if there is no more payments then an empty/invalid TQDate() * if there is no more payments then an empty/invalid TQDate()
* will be returned. * 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. * Calculates the dates of the payment over a certain period of time.

70
kmymoney2/mymoney/mymoneyscheduletest.cpp
Unescape View File

@ -55,7 +55,7 @@ void MyMoneyScheduleTest::testConstructor() {
MyMoneySchedule::TYPE_BILL, MyMoneySchedule::TYPE_BILL,
MyMoneySchedule::OCCUR_WEEKLY, 1, MyMoneySchedule::OCCUR_WEEKLY, 1,
MyMoneySchedule::STYPE_DIRECTDEBIT, MyMoneySchedule::STYPE_DIRECTDEBIT,
TQDate::tqcurrentDate(), TQDate::currentDate(),
TQDate(), TQDate(),
true, true,
true); true);
@ -82,8 +82,8 @@ void MyMoneyScheduleTest::testSetFunctions() {
s.setType(MyMoneySchedule::TYPE_BILL); s.setType(MyMoneySchedule::TYPE_BILL);
CPPUNIT_ASSERT(s.type() == MyMoneySchedule::TYPE_BILL); CPPUNIT_ASSERT(s.type() == MyMoneySchedule::TYPE_BILL);
s.setEndDate(TQDate::tqcurrentDate()); s.setEndDate(TQDate::currentDate());
CPPUNIT_ASSERT(s.endDate() == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(s.endDate() == TQDate::currentDate());
CPPUNIT_ASSERT(s.willEnd() == true); CPPUNIT_ASSERT(s.willEnd() == true);
} }
@ -229,16 +229,16 @@ void MyMoneyScheduleTest::testOverdue()
MyMoneySchedule sch_overdue; MyMoneySchedule sch_overdue;
MyMoneySchedule sch_intime; 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 // between the 1st and 27th. If it is between 28th and 31st
// we don't perform them. Note: this should be fixed. // 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; std::cout << std::endl << "testOverdue() skipped because current day is between 28th and 2nd" << std::endl;
return; return;
} }
TQDate startDate = TQDate::tqcurrentDate().addDays(-1).addMonths(-23); TQDate startDate = TQDate::currentDate().addDays(-1).addMonths(-23);
TQDate lastPaymentDate = TQDate::tqcurrentDate().addDays(-1).addMonths(-1); TQDate lastPaymentDate = TQDate::currentDate().addDays(-1).addMonths(-1);
TQString ref = TQString( TQString ref = TQString(
"<!DOCTYPE TEST>\n" "<!DOCTYPE TEST>\n"
@ -1010,13 +1010,13 @@ void MyMoneyScheduleTest::testWriteXML() {
MyMoneySchedule::TYPE_BILL, MyMoneySchedule::TYPE_BILL,
MyMoneySchedule::OCCUR_WEEKLY, 123, MyMoneySchedule::OCCUR_WEEKLY, 123,
MyMoneySchedule::STYPE_DIRECTDEBIT, MyMoneySchedule::STYPE_DIRECTDEBIT,
TQDate::tqcurrentDate(), TQDate::currentDate(),
TQDate(), TQDate(),
true, true,
true); true);
sch.setLastPayment(TQDate::tqcurrentDate()); sch.setLastPayment(TQDate::currentDate());
sch.recordPayment(TQDate::tqcurrentDate()); sch.recordPayment(TQDate::currentDate());
sch.setId("SCH0001"); sch.setId("SCH0001");
MyMoneyTransaction t; MyMoneyTransaction t;
@ -1070,9 +1070,9 @@ void MyMoneyScheduleTest::testWriteXML() {
" </TRANSACTION>\n" " </TRANSACTION>\n"
" </SCHEDULED_TX>\n" " </SCHEDULED_TX>\n"
"</SCHEDULE-CONTAINER>\n" "</SCHEDULE-CONTAINER>\n"
).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) ).tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) .tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); .tqarg(TQDate::currentDate().toString(Qt::ISODate));
CPPUNIT_ASSERT(doc.toString() == ref); CPPUNIT_ASSERT(doc.toString() == ref);
} }
@ -1098,9 +1098,9 @@ void MyMoneyScheduleTest::testReadXML() {
" </TRANSACTION>\n" " </TRANSACTION>\n"
" </SCHEDULED_TX>\n" " </SCHEDULED_TX>\n"
"</SCHEDULE-CONTAINER>\n" "</SCHEDULE-CONTAINER>\n"
).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) ).tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) .tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); .tqarg(TQDate::currentDate().toString(Qt::ISODate));
// diff to ref_ok1 is that we now have an empty entrydate // diff to ref_ok1 is that we now have an empty entrydate
// in the transaction parameters // in the transaction parameters
@ -1122,9 +1122,9 @@ void MyMoneyScheduleTest::testReadXML() {
" </TRANSACTION>\n" " </TRANSACTION>\n"
" </SCHEDULED_TX>\n" " </SCHEDULED_TX>\n"
"</SCHEDULE-CONTAINER>\n" "</SCHEDULE-CONTAINER>\n"
).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) ).tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) .tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); .tqarg(TQDate::currentDate().toString(Qt::ISODate));
TQString ref_false = TQString( TQString ref_false = TQString(
"<!DOCTYPE TEST>\n" "<!DOCTYPE TEST>\n"
@ -1144,9 +1144,9 @@ void MyMoneyScheduleTest::testReadXML() {
" </TRANSACTION>\n" " </TRANSACTION>\n"
" </SCHEDULED_TX>\n" " </SCHEDULED_TX>\n"
"</SCHEDULE-CONTAINER>\n" "</SCHEDULE-CONTAINER>\n"
).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) ).tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) .tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); .tqarg(TQDate::currentDate().toString(Qt::ISODate));
TQDomDocument doc; TQDomDocument doc;
TQDomElement node; TQDomElement node;
@ -1167,13 +1167,13 @@ void MyMoneyScheduleTest::testReadXML() {
try { try {
sch = MyMoneySchedule(node); sch = MyMoneySchedule(node);
CPPUNIT_ASSERT(sch.id() == "SCH0002"); CPPUNIT_ASSERT(sch.id() == "SCH0002");
CPPUNIT_ASSERT(sch.nextDueDate() == TQDate::tqcurrentDate().addDays(7)); CPPUNIT_ASSERT(sch.nextDueDate() == TQDate::currentDate().addDays(7));
CPPUNIT_ASSERT(sch.startDate() == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(sch.startDate() == TQDate::currentDate());
CPPUNIT_ASSERT(sch.endDate() == TQDate()); CPPUNIT_ASSERT(sch.endDate() == TQDate());
CPPUNIT_ASSERT(sch.autoEnter() == true); CPPUNIT_ASSERT(sch.autoEnter() == true);
CPPUNIT_ASSERT(sch.isFixed() == true); CPPUNIT_ASSERT(sch.isFixed() == true);
CPPUNIT_ASSERT(sch.weekendOption() == MyMoneySchedule::MoveNothing); 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.paymentType() == MyMoneySchedule::STYPE_DIRECTDEBIT);
CPPUNIT_ASSERT(sch.type() == MyMoneySchedule::TYPE_BILL); CPPUNIT_ASSERT(sch.type() == MyMoneySchedule::TYPE_BILL);
CPPUNIT_ASSERT(sch.name() == "A Name"); CPPUNIT_ASSERT(sch.name() == "A Name");
@ -1181,7 +1181,7 @@ void MyMoneyScheduleTest::testReadXML() {
CPPUNIT_ASSERT(sch.occurenceMultiplier() == 1); CPPUNIT_ASSERT(sch.occurenceMultiplier() == 1);
CPPUNIT_ASSERT(sch.nextDueDate() == sch.lastPayment().addDays(7)); CPPUNIT_ASSERT(sch.nextDueDate() == sch.lastPayment().addDays(7));
CPPUNIT_ASSERT(sch.recordedPayments().count() == 1); CPPUNIT_ASSERT(sch.recordedPayments().count() == 1);
CPPUNIT_ASSERT(sch.recordedPayments()[0] == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(sch.recordedPayments()[0] == TQDate::currentDate());
} catch(MyMoneyException *e) { } catch(MyMoneyException *e) {
delete e; delete e;
CPPUNIT_FAIL("Unexpected exception"); CPPUNIT_FAIL("Unexpected exception");
@ -1194,13 +1194,13 @@ void MyMoneyScheduleTest::testReadXML() {
try { try {
sch = MyMoneySchedule(node); sch = MyMoneySchedule(node);
CPPUNIT_ASSERT(sch.id() == "SCH0002"); CPPUNIT_ASSERT(sch.id() == "SCH0002");
CPPUNIT_ASSERT(sch.nextDueDate() == TQDate::tqcurrentDate().addDays(7)); CPPUNIT_ASSERT(sch.nextDueDate() == TQDate::currentDate().addDays(7));
CPPUNIT_ASSERT(sch.startDate() == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(sch.startDate() == TQDate::currentDate());
CPPUNIT_ASSERT(sch.endDate() == TQDate()); CPPUNIT_ASSERT(sch.endDate() == TQDate());
CPPUNIT_ASSERT(sch.autoEnter() == true); CPPUNIT_ASSERT(sch.autoEnter() == true);
CPPUNIT_ASSERT(sch.isFixed() == true); CPPUNIT_ASSERT(sch.isFixed() == true);
CPPUNIT_ASSERT(sch.weekendOption() == MyMoneySchedule::MoveNothing); 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.paymentType() == MyMoneySchedule::STYPE_DIRECTDEBIT);
CPPUNIT_ASSERT(sch.type() == MyMoneySchedule::TYPE_BILL); CPPUNIT_ASSERT(sch.type() == MyMoneySchedule::TYPE_BILL);
CPPUNIT_ASSERT(sch.name() == "A Name"); CPPUNIT_ASSERT(sch.name() == "A Name");
@ -1208,7 +1208,7 @@ void MyMoneyScheduleTest::testReadXML() {
CPPUNIT_ASSERT(sch.occurenceMultiplier() == 1); CPPUNIT_ASSERT(sch.occurenceMultiplier() == 1);
CPPUNIT_ASSERT(sch.nextDueDate() == sch.lastPayment().addDays(7)); CPPUNIT_ASSERT(sch.nextDueDate() == sch.lastPayment().addDays(7));
CPPUNIT_ASSERT(sch.recordedPayments().count() == 1); CPPUNIT_ASSERT(sch.recordedPayments().count() == 1);
CPPUNIT_ASSERT(sch.recordedPayments()[0] == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(sch.recordedPayments()[0] == TQDate::currentDate());
} catch(MyMoneyException *e) { } catch(MyMoneyException *e) {
delete e; delete e;
CPPUNIT_FAIL("Unexpected exception"); CPPUNIT_FAIL("Unexpected exception");
@ -1236,9 +1236,9 @@ void MyMoneyScheduleTest::testHasReferenceTo()
" </TRANSACTION>\n" " </TRANSACTION>\n"
" </SCHEDULED_TX>\n" " </SCHEDULED_TX>\n"
"</SCHEDULE-CONTAINER>\n" "</SCHEDULE-CONTAINER>\n"
).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) ).tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) .tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); .tqarg(TQDate::currentDate().toString(Qt::ISODate));
TQDomDocument doc; TQDomDocument doc;
TQDomElement node; TQDomElement node;
@ -1872,7 +1872,7 @@ void MyMoneyScheduleTest::testPaidEarlyOneTime()
// https://bugs.kde.org/show_bug.cgi?id=231029 // https://bugs.kde.org/show_bug.cgi?id=231029
MyMoneySchedule sch; MyMoneySchedule sch;
TQDate paymentInFuture = TQDate::tqcurrentDate().addDays(7); TQDate paymentInFuture = TQDate::currentDate().addDays(7);
TQString ref_ok = TQString( TQString ref_ok = TQString(
"<!DOCTYPE TEST>\n" "<!DOCTYPE TEST>\n"
@ -1900,7 +1900,7 @@ void MyMoneyScheduleTest::testPaidEarlyOneTime()
sch = MyMoneySchedule(node); sch = MyMoneySchedule(node);
CPPUNIT_ASSERT(sch.isFinished() == true); CPPUNIT_ASSERT(sch.isFinished() == true);
CPPUNIT_ASSERT(sch.occurencePeriod() == MyMoneySchedule::OCCUR_MONTHLY); 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) { } catch (MyMoneyException *e) {
delete e; delete e;
CPPUNIT_FAIL("Unexpected exception"); CPPUNIT_FAIL("Unexpected exception");

2
kmymoney2/mymoney/mymoneytransaction.cpp
Unescape View File

@ -39,7 +39,7 @@ MyMoneyTransaction::MyMoneyTransaction(const TQString id, const MyMoneyTransacti
*this = transaction; *this = transaction;
m_id = id; m_id = id;
if(m_entryDate == TQDate()) if(m_entryDate == TQDate())
m_entryDate = TQDate::tqcurrentDate(); m_entryDate = TQDate::currentDate();
TQValueList<MyMoneySplit>::Iterator it; TQValueList<MyMoneySplit>::Iterator it;
for(it = m_splits.begin(); it != m_splits.end(); ++it) { for(it = m_splits.begin(); it != m_splits.end(); ++it) {

68
kmymoney2/mymoney/mymoneytransactionfilter.cpp
Unescape View File

@ -711,9 +711,9 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start,
{ {
bool rc = true; bool rc = true;
int yr, mon, day; int yr, mon, day;
yr = TQDate::tqcurrentDate().year(); yr = TQDate::currentDate().year();
mon = TQDate::tqcurrentDate().month(); mon = TQDate::currentDate().month();
day = TQDate::tqcurrentDate().day(); day = TQDate::currentDate().day();
TQDate tmp; TQDate tmp;
switch(id) { switch(id) {
@ -723,7 +723,7 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start,
break; break;
case MyMoneyTransactionFilter::asOfToday: case MyMoneyTransactionFilter::asOfToday:
start = TQDate(); start = TQDate();
end = TQDate::tqcurrentDate(); end = TQDate::currentDate();
break; break;
case MyMoneyTransactionFilter::currentMonth: case MyMoneyTransactionFilter::currentMonth:
start = TQDate(yr,mon,1); start = TQDate(yr,mon,1);
@ -735,11 +735,11 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start,
break; break;
case MyMoneyTransactionFilter::monthToDate: case MyMoneyTransactionFilter::monthToDate:
start = TQDate(yr,mon,1); start = TQDate(yr,mon,1);
end = TQDate::tqcurrentDate(); end = TQDate::currentDate();
break; break;
case MyMoneyTransactionFilter::yearToDate: case MyMoneyTransactionFilter::yearToDate:
start = TQDate(yr,1,1); start = TQDate(yr,1,1);
end = TQDate::tqcurrentDate(); end = TQDate::currentDate();
break; break;
case MyMoneyTransactionFilter::yearToMonth: case MyMoneyTransactionFilter::yearToMonth:
start = TQDate(yr,1,1); start = TQDate(yr,1,1);
@ -754,56 +754,56 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start,
end = TQDate(yr,12,31).addYears(-1); end = TQDate(yr,12,31).addYears(-1);
break; break;
case MyMoneyTransactionFilter::last7Days: case MyMoneyTransactionFilter::last7Days:
start = TQDate::tqcurrentDate().addDays(-7); start = TQDate::currentDate().addDays(-7);
end = TQDate::tqcurrentDate(); end = TQDate::currentDate();
break; break;
case MyMoneyTransactionFilter::last30Days: case MyMoneyTransactionFilter::last30Days:
start = TQDate::tqcurrentDate().addDays(-30); start = TQDate::currentDate().addDays(-30);
end = TQDate::tqcurrentDate(); end = TQDate::currentDate();
break; break;
case MyMoneyTransactionFilter::last3Months: case MyMoneyTransactionFilter::last3Months:
start = TQDate::tqcurrentDate().addMonths(-3); start = TQDate::currentDate().addMonths(-3);
end = TQDate::tqcurrentDate(); end = TQDate::currentDate();
break; break;
case MyMoneyTransactionFilter::last6Months: case MyMoneyTransactionFilter::last6Months:
start = TQDate::tqcurrentDate().addMonths(-6); start = TQDate::currentDate().addMonths(-6);
end = TQDate::tqcurrentDate(); end = TQDate::currentDate();
break; break;
case MyMoneyTransactionFilter::last11Months: case MyMoneyTransactionFilter::last11Months:
start = TQDate(yr,mon,1).addMonths(-12); start = TQDate(yr,mon,1).addMonths(-12);
end = TQDate(yr,mon,1).addDays(-1); end = TQDate(yr,mon,1).addDays(-1);
break; break;
case MyMoneyTransactionFilter::last12Months: case MyMoneyTransactionFilter::last12Months:
start = TQDate::tqcurrentDate().addMonths(-12); start = TQDate::currentDate().addMonths(-12);
end = TQDate::tqcurrentDate(); end = TQDate::currentDate();
break; break;
case MyMoneyTransactionFilter::next7Days: case MyMoneyTransactionFilter::next7Days:
start = TQDate::tqcurrentDate(); start = TQDate::currentDate();
end = TQDate::tqcurrentDate().addDays(7); end = TQDate::currentDate().addDays(7);
break; break;
case MyMoneyTransactionFilter::next30Days: case MyMoneyTransactionFilter::next30Days:
start = TQDate::tqcurrentDate(); start = TQDate::currentDate();
end = TQDate::tqcurrentDate().addDays(30); end = TQDate::currentDate().addDays(30);
break; break;
case MyMoneyTransactionFilter::next3Months: case MyMoneyTransactionFilter::next3Months:
start = TQDate::tqcurrentDate(); start = TQDate::currentDate();
end = TQDate::tqcurrentDate().addMonths(3); end = TQDate::currentDate().addMonths(3);
break; break;
case MyMoneyTransactionFilter::next6Months: case MyMoneyTransactionFilter::next6Months:
start = TQDate::tqcurrentDate(); start = TQDate::currentDate();
end = TQDate::tqcurrentDate().addMonths(6); end = TQDate::currentDate().addMonths(6);
break; break;
case MyMoneyTransactionFilter::next12Months: case MyMoneyTransactionFilter::next12Months:
start = TQDate::tqcurrentDate(); start = TQDate::currentDate();
end = TQDate::tqcurrentDate().addMonths(12); end = TQDate::currentDate().addMonths(12);
break; break;
case MyMoneyTransactionFilter::userDefined: case MyMoneyTransactionFilter::userDefined:
start = TQDate(); start = TQDate();
end = TQDate(); end = TQDate();
break; break;
case MyMoneyTransactionFilter::last3ToNext3Months: case MyMoneyTransactionFilter::last3ToNext3Months:
start = TQDate::tqcurrentDate().addMonths(-3); start = TQDate::currentDate().addMonths(-3);
end = TQDate::tqcurrentDate().addMonths(3); end = TQDate::currentDate().addMonths(3);
break; break;
case MyMoneyTransactionFilter::currentQuarter: case MyMoneyTransactionFilter::currentQuarter:
start = TQDate(yr, mon - ((mon-1) % 3), 1); 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); end = start.addMonths(3).addDays(-1);
break; break;
case MyMoneyTransactionFilter::currentFiscalYear: case MyMoneyTransactionFilter::currentFiscalYear:
start = TQDate(TQDate::tqcurrentDate().year(), fiscalYearStartMonth, fiscalYearStartDay); start = TQDate(TQDate::currentDate().year(), fiscalYearStartMonth, fiscalYearStartDay);
if(TQDate::tqcurrentDate() < start) if(TQDate::currentDate() < start)
start = start.addYears(-1); start = start.addYears(-1);
end = start.addYears(1).addDays(-1); end = start.addYears(1).addDays(-1);
break; break;
case MyMoneyTransactionFilter::lastFiscalYear: case MyMoneyTransactionFilter::lastFiscalYear:
start = TQDate(TQDate::tqcurrentDate().year(), fiscalYearStartMonth, fiscalYearStartDay); start = TQDate(TQDate::currentDate().year(), fiscalYearStartMonth, fiscalYearStartDay);
if(TQDate::tqcurrentDate() < start) if(TQDate::currentDate() < start)
start = start.addYears(-1); start = start.addYears(-1);
start = start.addYears(-1); start = start.addYears(-1);
end = start.addYears(1).addDays(-1); end = start.addYears(1).addDays(-1);
break; break;
case MyMoneyTransactionFilter::today: case MyMoneyTransactionFilter::today:
start = TQDate::tqcurrentDate(); start = TQDate::currentDate();
end = TQDate::tqcurrentDate(); end = TQDate::currentDate();
break; break;
default: default:
qFatal("Unknown date identifier %d in MyMoneyTransactionFilter::translateDateRange()", id); qFatal("Unknown date identifier %d in MyMoneyTransactionFilter::translateDateRange()", id);

6
kmymoney2/mymoney/mymoneytransactiontest.cpp
Unescape View File

@ -49,7 +49,7 @@ void MyMoneyTransactionTest::testConstructor() {
MyMoneyTransaction a("ID", *m); MyMoneyTransaction a("ID", *m);
CPPUNIT_ASSERT(a.id() == "ID"); 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.memo() == "Memo");
CPPUNIT_ASSERT(a.postDate() == TQDate(1,2,3)); CPPUNIT_ASSERT(a.postDate() == TQDate(1,2,3));
} }
@ -62,7 +62,7 @@ void MyMoneyTransactionTest::testCopyConstructor() {
MyMoneyTransaction n(a); MyMoneyTransaction n(a);
CPPUNIT_ASSERT(n.id() == "ID"); 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.memo() == "Memo");
CPPUNIT_ASSERT(n.postDate() == TQDate(1,2,3)); CPPUNIT_ASSERT(n.postDate() == TQDate(1,2,3));
CPPUNIT_ASSERT(n.value("Key") == "Value"); CPPUNIT_ASSERT(n.value("Key") == "Value");
@ -78,7 +78,7 @@ void MyMoneyTransactionTest::testAssignmentConstructor() {
n = a; n = a;
CPPUNIT_ASSERT(n.id() == "ID"); 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.memo() == "Memo");
CPPUNIT_ASSERT(n.postDate() == TQDate(1,2,3)); CPPUNIT_ASSERT(n.postDate() == TQDate(1,2,3));
CPPUNIT_ASSERT(n.value("Key") == "Value"); CPPUNIT_ASSERT(n.value("Key") == "Value");

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

@ -26,8 +26,8 @@
#define PASS } catch (MyMoneyException *e) { throw; } #define PASS } catch (MyMoneyException *e) { throw; }
MyMoneyDatabaseMgr::MyMoneyDatabaseMgr() : MyMoneyDatabaseMgr::MyMoneyDatabaseMgr() :
m_creationDate (TQDate::tqcurrentDate ()), m_creationDate (TQDate::currentDate ()),
m_lastModificationDate (TQDate::tqcurrentDate ()), m_lastModificationDate (TQDate::currentDate ()),
m_sql (0) m_sql (0)
{ } { }
@ -913,7 +913,7 @@ const MyMoneyMoney MyMoneyDatabaseMgr::balance(const TQString& id, const TQDate&
//DEBUG //DEBUG
TQDate date_ (date); TQDate date_ (date);
//if (date_ == TQDate()) date_ = TQDate::tqcurrentDate(); //if (date_ == TQDate()) date_ = TQDate::currentDate();
// END DEBUG // END DEBUG
MyMoneyMoney result(0); MyMoneyMoney result(0);
@ -1278,7 +1278,7 @@ const TQValueList<MyMoneySchedule> MyMoneyDatabaseMgr::scheduleList(const TQStri
TQDate nextPayment = (*pos).nextPayment((*pos).lastPayment()); TQDate nextPayment = (*pos).nextPayment((*pos).lastPayment());
if(!nextPayment.isValid()) if(!nextPayment.isValid())
continue; continue;
if(nextPayment >= TQDate::tqcurrentDate()) if(nextPayment >= TQDate::currentDate())
continue; continue;
*/ */
} }

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

@ -70,7 +70,7 @@ void MyMoneyDatabaseMgrTest::testEmptyConstructor()
CPPUNIT_ASSERT(m->payeeList().count() == 0); CPPUNIT_ASSERT(m->payeeList().count() == 0);
CPPUNIT_ASSERT(m->scheduleList().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() { void MyMoneyDatabaseMgrTest::testCreateDb() {
@ -118,8 +118,8 @@ void MyMoneyDatabaseMgrTest::testAttachDb() {
MyMoneyFile::instance()->detachStorage(); MyMoneyFile::instance()->detachStorage();
KSharedPtr <MyMoneyStorageSql> sql = m->connectToDatabase(m_url); KSharedPtr <MyMoneyStorageSql> sql = m->connectToDatabase(m_url);
CPPUNIT_ASSERT(sql); CPPUNIT_ASSERT(sql);
int opentqStatus = sql->open(m_url, IO_ReadWrite); int openStatus = sql->open(m_url, IO_ReadWrite);
CPPUNIT_ASSERT(0 == opentqStatus); CPPUNIT_ASSERT(0 == openStatus);
MyMoneyFile::instance()->attachStorage(m); MyMoneyFile::instance()->attachStorage(m);
m->startTransaction(); m->startTransaction();
m_dbAttached = true; m_dbAttached = true;
@ -717,7 +717,7 @@ void MyMoneyDatabaseMgrTest::testAddBudget() {
MyMoneyBudget budget; MyMoneyBudget budget;
budget.setName("TestBudget"); budget.setName("TestBudget");
budget.setBudgetStart(TQDate::tqcurrentDate(TQt::LocalTime)); budget.setBudgetStart(TQDate::currentDate(TQt::LocalTime));
m->addBudget(budget); m->addBudget(budget);
@ -773,7 +773,7 @@ void MyMoneyDatabaseMgrTest::testModifyBudget() {
MyMoneyBudget budget = m->budgetByName("TestBudget"); MyMoneyBudget budget = m->budgetByName("TestBudget");
budget.setBudgetStart(TQDate::tqcurrentDate(TQt::LocalTime).addDays(-1)); budget.setBudgetStart(TQDate::currentDate(TQt::LocalTime).addDays(-1));
m->modifyBudget(budget); m->modifyBudget(budget);
@ -1650,7 +1650,7 @@ void MyMoneyDatabaseMgrTest::testScheduleList() {
// put some accounts in the db, so the tests don't break // put some accounts in the db, so the tests don't break
testReparentAccount(); testReparentAccount();
TQDate testDate = TQDate::tqcurrentDate(); TQDate testDate = TQDate::currentDate();
TQDate notOverdue = testDate.addDays(2); TQDate notOverdue = testDate.addDays(2);
TQDate overdue = testDate.addDays(-2); TQDate overdue = testDate.addDays(-2);

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

@ -44,7 +44,7 @@ MyMoneySeqAccessMgr::MyMoneySeqAccessMgr()
m_nextBudgetID = 0; m_nextBudgetID = 0;
m_user = MyMoneyPayee(); m_user = MyMoneyPayee();
m_dirty = false; m_dirty = false;
m_creationDate = TQDate::tqcurrentDate(); m_creationDate = TQDate::currentDate();
// setup standard accounts // setup standard accounts
MyMoneyAccount acc_l; MyMoneyAccount acc_l;
@ -448,7 +448,7 @@ void MyMoneySeqAccessMgr::addTransaction(MyMoneyTransaction& transaction, const
void MyMoneySeqAccessMgr::touch(void) void MyMoneySeqAccessMgr::touch(void)
{ {
m_dirty = true; m_dirty = true;
m_lastModificationDate = TQDate::tqcurrentDate(); m_lastModificationDate = TQDate::currentDate();
} }
bool MyMoneySeqAccessMgr::hasActiveSplits(const TQString& id) const bool MyMoneySeqAccessMgr::hasActiveSplits(const TQString& id) const
@ -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 no valid date is passed, we use today's date.
if(!date.isValid()) if(!date.isValid())
date = TQDate::tqcurrentDate(); date = TQDate::currentDate();
// If the caller selected an exact entry, we can search for // If the caller selected an exact entry, we can search for
// it using the date as the key // it using the date as the key

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

@ -939,7 +939,7 @@ public:
/** /**
* This method retrieves a price from the price list. * 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; const MyMoneyPrice price(const TQString& fromId, const TQString& toId, const TQDate& date, const bool exactDate) const;

4
kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
Unescape View File

@ -63,7 +63,7 @@ void MyMoneySeqAccessMgrTest::testEmptyConstructor()
CPPUNIT_ASSERT(m->m_scheduleList.count() == 0); CPPUNIT_ASSERT(m->m_scheduleList.count() == 0);
CPPUNIT_ASSERT(m->m_dirty == false); 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->liability().name() == "Liability");
CPPUNIT_ASSERT(m->asset().name() == "Asset"); CPPUNIT_ASSERT(m->asset().name() == "Asset");
@ -1302,7 +1302,7 @@ void MyMoneySeqAccessMgrTest::testRemoveSchedule() {
} }
void MyMoneySeqAccessMgrTest::testScheduleList() { void MyMoneySeqAccessMgrTest::testScheduleList() {
TQDate testDate = TQDate::tqcurrentDate(); TQDate testDate = TQDate::currentDate();
TQDate notOverdue = testDate.addDays(2); TQDate notOverdue = testDate.addDays(2);
TQDate overdue = testDate.addDays(-2); TQDate overdue = testDate.addDays(-2);

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

@ -118,7 +118,7 @@ MyMoneyStorageSql::MyMoneyStorageSql (IMyMoneySerialize *storage, const KURL& ur
DBG("*** Entering MyMoneyStorageSql::MyMoneyStorageSql"); DBG("*** Entering MyMoneyStorageSql::MyMoneyStorageSql");
m_dbVersion = 0; m_dbVersion = 0;
m_progressCallback = 0; m_progressCallback = 0;
m_displaytqStatus = false; m_displayStatus = false;
m_storage = storage; m_storage = storage;
m_storagePtr = dynamic_cast<IMyMoneyStorage*>(storage); m_storagePtr = dynamic_cast<IMyMoneyStorage*>(storage);
m_newDatabase = false; m_newDatabase = false;
@ -200,7 +200,7 @@ try {
rc = -1; rc = -1;
} else { } else {
m_logonUser = url.user() + "@" + url.host(); m_logonUser = url.user() + "@" + url.host();
m_logonAt = TQDateTime::tqcurrentDateTime(); m_logonAt = TQDateTime::currentDateTime();
writeFileInfo(); writeFileInfo();
} }
return(rc); return(rc);
@ -821,7 +821,7 @@ void MyMoneyStorageSql::clean() {
bool MyMoneyStorageSql::readFile(void) { bool MyMoneyStorageSql::readFile(void) {
DBG("*** Entering MyMoneyStorageSql::readFile"); DBG("*** Entering MyMoneyStorageSql::readFile");
m_displaytqStatus = true; m_displayStatus = true;
try { try {
readFileInfo(); readFileInfo();
readInstitutions(); readInstitutions();
@ -860,7 +860,7 @@ bool MyMoneyStorageSql::readFile(void) {
// FIXME?? if (m_mode == 0) m_storage = NULL; // FIXME?? if (m_mode == 0) m_storage = NULL;
// make sure the progress bar is not shown any longer // make sure the progress bar is not shown any longer
signalProgress(-1, -1); signalProgress(-1, -1);
m_displaytqStatus = false; m_displayStatus = false;
//MyMoneySqlQuery::traceOn(); //MyMoneySqlQuery::traceOn();
return true; return true;
} catch (TQString& s) { } 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_securities = m_prices = m_currencies = m_schedules = m_reports = m_kvps = m_budgets = 0;
m_hiIdInstitutions = m_hiIdPayees = m_hiIdAccounts = m_hiIdTransactions = m_hiIdInstitutions = m_hiIdPayees = m_hiIdAccounts = m_hiIdTransactions =
m_hiIdSchedules = m_hiIdSecurities = m_hiIdReports = m_hiIdBudgets = 0; m_hiIdSchedules = m_hiIdSecurities = m_hiIdReports = m_hiIdBudgets = 0;
m_displaytqStatus = true; m_displayStatus = true;
try{ try{
startCommitUnit(__func__); startCommitUnit(__func__);
writeInstitutions (); writeInstitutions ();
@ -897,7 +897,7 @@ bool MyMoneyStorageSql::writeFile(void) {
endCommitUnit(__func__); endCommitUnit(__func__);
// make sure the progress bar is not shown any longer // make sure the progress bar is not shown any longer
signalProgress(-1, -1); signalProgress(-1, -1);
m_displaytqStatus = false; m_displayStatus = false;
return true; return true;
} catch (TQString& s) { } catch (TQString& s) {
return false; return false;
@ -2167,7 +2167,7 @@ void MyMoneyStorageSql::writeFileInfo() {
q.bindValue(":fixLevel", m_storage->fileFixVersion()); q.bindValue(":fixLevel", m_storage->fileFixVersion());
q.bindValue(":created", TQString(m_storage->creationDate().toString(Qt::ISODate))); q.bindValue(":created", TQString(m_storage->creationDate().toString(Qt::ISODate)));
//q.bindValue(":lastModified", m_storage->lastModificationDate().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(":baseCurrency", m_storage->pairs()["kmm-baseCurrency"]);
q.bindValue(":institutions", (unsigned long long) m_institutions); q.bindValue(":institutions", (unsigned long long) m_institutions);
q.bindValue(":accounts", (unsigned long long) m_accounts); q.bindValue(":accounts", (unsigned long long) m_accounts);
@ -2410,7 +2410,7 @@ void MyMoneyStorageSql::readPayees(const TQValueList<TQString> pid) {
const TQMap<TQString, MyMoneyPayee> MyMoneyStorageSql::fetchPayees (const TQStringList& idList, bool /*forUpdate*/) const { const TQMap<TQString, MyMoneyPayee> MyMoneyStorageSql::fetchPayees (const TQStringList& idList, bool /*forUpdate*/) const {
DBG("*** Entering MyMoneyStorageSql::readPayees"); DBG("*** Entering MyMoneyStorageSql::readPayees");
if (m_displaytqStatus) { if (m_displayStatus) {
signalProgress(0, m_payees, TQObject::tr("Loading payees...")); signalProgress(0, m_payees, TQObject::tr("Loading payees..."));
} else { } else {
// if (m_payeeListRead) return; // if (m_payeeListRead) return;
@ -2472,7 +2472,7 @@ const TQMap<TQString, MyMoneyPayee> MyMoneyStorageSql::fetchPayees (const TQStri
//if(id > lastId) //if(id > lastId)
// lastId = id; // lastId = id;
} }
if (m_displaytqStatus) signalProgress(++progress, 0); if (m_displayStatus) signalProgress(++progress, 0);
} }
return pList; return pList;
} }
@ -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 { const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions (const TQString& tidList, const TQString& dateClause, bool /*forUpdate*/) const {
DBG("*** Entering MyMoneyStorageSql::readTransactions"); DBG("*** Entering MyMoneyStorageSql::readTransactions");
// if (m_transactionListRead) return; // all list already in memory // 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; int progress = 0;
// m_payeeList.clear(); // m_payeeList.clear();
TQString whereClause; TQString whereClause;
@ -2748,7 +2748,7 @@ const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions (
i != txMapEnd; ++i) { i != txMapEnd; ++i) {
i.data().setPairs(kvpMap[i.data().id()].pairs()); 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())) { if ((tidList.isEmpty()) && (dateClause.isEmpty())) {
@ -3245,7 +3245,7 @@ const MyMoneyPrice MyMoneyStorageSql::fetchSinglePrice (const TQString& fromIdL
TQDate date (date_); TQDate date (date_);
if(!date.isValid()) if(!date.isValid())
date = TQDate::tqcurrentDate(); date = TQDate::currentDate();
q.bindValue(":fromId", fromIdList); q.bindValue(":fromId", fromIdList);
q.bindValue(":toId", toIdList); q.bindValue(":toId", toIdList);
@ -4131,9 +4131,9 @@ const TQString MyMoneyDbDef::generateSQL (const TQString& driver) const {
replace = TQString::number replace = TQString::number
(MyMoneyFile::instance()->storage()->currentFixVersion()); (MyMoneyFile::instance()->storage()->currentFixVersion());
if ((*fit)->name() == "created") if ((*fit)->name() == "created")
replace = TQDate::tqcurrentDate().toString(Qt::ISODate); replace = TQDate::currentDate().toString(Qt::ISODate);
if ((*fit)->name() == "lastModified") if ((*fit)->name() == "lastModified")
replace = TQDate::tqcurrentDate().toString(Qt::ISODate); replace = TQDate::currentDate().toString(Qt::ISODate);
if ((*fit)->name() == "updateInProgress") if ((*fit)->name() == "updateInProgress")
replace = enclose("N"); replace = enclose("N");
qs.replace(toReplace, replace); qs.replace(toReplace, replace);

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

@ -747,7 +747,7 @@ private:
* initial data load and final write * 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 * 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 * payee popup list, it becomes necessary to load all data into memory. The

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

@ -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(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*))); 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...").tqarg(m_connector.url()));
kProgress1->setTotalSteps(3); kProgress1->setTotalSteps(3);
kProgress1->setProgress(1); kProgress1->setProgress(1);
} }
void KOfxDirectConnectDlg::settqStatus(const TQString& _status) void KOfxDirectConnectDlg::setStatus(const TQString& _status)
{ {
textLabel1->setText(_status); textLabel1->setText(_status);
kdDebug(2) << "STATUS: " << _status << endl; kdDebug(2) << "STATUS: " << _status << endl;
@ -138,7 +138,7 @@ void KOfxDirectConnectDlg::slotOfxConnected(KIO::Job*)
delete m_tmpfile; //delete otherwise we mem leak delete m_tmpfile; //delete otherwise we mem leak
} }
m_tmpfile = new KTempFile(); m_tmpfile = new KTempFile();
settqStatus("Connection established, retrieving data..."); setStatus("Connection established, retrieving data...");
setDetails(TQString("Downloading data to %1...").tqarg(m_tmpfile->name())); setDetails(TQString("Downloading data to %1...").tqarg(m_tmpfile->name()));
kProgress1->advance(1); kProgress1->advance(1);
} }
@ -160,7 +160,7 @@ void KOfxDirectConnectDlg::slotOfxData(KIO::Job*,const TQByteArray& _ba)
void KOfxDirectConnectDlg::slotOfxFinished(KIO::Job* /* e */) void KOfxDirectConnectDlg::slotOfxFinished(KIO::Job* /* e */)
{ {
kProgress1->advance(1); kProgress1->advance(1);
settqStatus("Completed."); setStatus("Completed.");
if(d->m_fpTrace.isOpen()) { if(d->m_fpTrace.isOpen()) {
d->m_fpTrace.writeBlock("\nCompleted\n\n\n\n", 14); d->m_fpTrace.writeBlock("\nCompleted\n\n\n\n", 14);

2
kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h
Unescape View File

@ -70,7 +70,7 @@ protected slots:
virtual void reject(void); virtual void reject(void);
protected: protected:
void settqStatus(const TQString& _status); void setStatus(const TQString& _status);
void setDetails(const TQString& _details); void setDetails(const TQString& _details);
KTempFile* m_tmpfile; KTempFile* m_tmpfile;

4
kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui
Unescape View File

@ -53,7 +53,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>51</width> <width>51</width>
<height>20</height> <height>20</height>
@ -84,7 +84,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>20</height> <height>20</height>

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

@ -168,7 +168,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>90</height> <height>90</height>
@ -228,7 +228,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>120</width> <width>120</width>
<height>21</height> <height>21</height>

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

@ -48,16 +48,16 @@
#include <libofx/libofx.h> #include <libofx/libofx.h>
#include "mymoneyofxconnector.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), KOnlineBankingStatusDecl(parent,name),
m_appId(0) m_appId(0)
{ {
m_ledOnlinetqStatus->off(); m_ledOnlineStatus->off();
// Set up online banking settings if applicable // Set up online banking settings if applicable
MyMoneyKeyValueContainer settings = acc.onlineBankingSettings(); MyMoneyKeyValueContainer settings = acc.onlineBankingSettings();
m_textOnlinetqStatus->setText(i18n("Enabled & configured")); m_textOnlineStatus->setText(i18n("Enabled & configured"));
m_ledOnlinetqStatus->on(); m_ledOnlineStatus->on();
TQString account = settings.value("accountid"); TQString account = settings.value("accountid");
TQString bank = settings.value("bankname"); TQString bank = settings.value("bankname");
@ -83,25 +83,25 @@ KOnlineBankingtqStatus::KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidg
if (!specificDate.isEmpty()) if (!specificDate.isEmpty())
m_specificDate->setDate(TQDate::fromString(specificDate)); m_specificDate->setDate(TQDate::fromString(specificDate));
else else
m_specificDate->setDate(TQDate::tqcurrentDate()); m_specificDate->setDate(TQDate::currentDate());
m_specificDate->setMaxValue(TQDate::tqcurrentDate()); m_specificDate->setMaxValue(TQDate::currentDate());
m_payeeidRB->setChecked(settings.value("kmmofx-preferPayeeid").isEmpty() || settings.value("kmmofx-preferPayeeid").toInt() != 0); 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); m_nameRB->setChecked(!settings.value("kmmofx-preferName").isEmpty() && settings.value("kmmofx-preferName").toInt() != 0);
} }
KOnlineBankingtqStatus::~KOnlineBankingtqStatus() KOnlineBankingStatus::~KOnlineBankingStatus()
{ {
delete m_appId; delete m_appId;
} }
const TQString& KOnlineBankingtqStatus::appId(void) const const TQString& KOnlineBankingStatus::appId(void) const
{ {
if(m_appId) if(m_appId)
return m_appId->appId(); return m_appId->appId();
return TQString(); return TQString();
} }
TQString KOnlineBankingtqStatus::headerVersion(void) const TQString KOnlineBankingStatus::headerVersion(void) const
{ {
if(m_headerVersion) if(m_headerVersion)
return m_headerVersion->headerVersion(); return m_headerVersion->headerVersion();

6
kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h
Unescape View File

@ -41,13 +41,13 @@ class OfxHeaderVersion;
* @author Thomas Baumgart * @author Thomas Baumgart
*/ */
class KOnlineBankingtqStatus : public KOnlineBankingStatusDecl class KOnlineBankingStatus : public KOnlineBankingStatusDecl
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidget *parent=0, const char *name=0); KOnlineBankingStatus(const MyMoneyAccount& acc, TQWidget *parent=0, const char *name=0);
~KOnlineBankingtqStatus(); ~KOnlineBankingStatus();
const TQString& appId(void) const; const TQString& appId(void) const;
TQString headerVersion(void) const; TQString headerVersion(void) const;
private: private:

14
kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui
Unescape View File

@ -87,7 +87,7 @@
</property> </property>
<widget class="KLed"> <widget class="KLed">
<property name="name"> <property name="name">
<cstring>m_ledOnlinetqStatus</cstring> <cstring>m_ledOnlineStatus</cstring>
</property> </property>
<property name="state"> <property name="state">
<enum>Off</enum> <enum>Off</enum>
@ -95,7 +95,7 @@
</widget> </widget>
<widget class="TQLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>m_textOnlinetqStatus</cstring> <cstring>m_textOnlineStatus</cstring>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy>
@ -119,7 +119,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>21</height> <height>21</height>
@ -188,7 +188,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>150</width> <width>150</width>
<height>21</height> <height>21</height>
@ -346,7 +346,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>20</height> <height>20</height>
@ -435,7 +435,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>20</height> <height>20</height>
@ -456,7 +456,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>50</height> <height>50</height>

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

@ -145,7 +145,7 @@ TQString MyMoneyOfxConnector::url(void) const { return m_fiSettings.value("url")
TQDate MyMoneyOfxConnector::statementStartDate(void) const { TQDate MyMoneyOfxConnector::statementStartDate(void) const {
if ((m_fiSettings.value("kmmofx-todayMinus").toInt() != 0) && !m_fiSettings.value("kmmofx-numRequestDays").isEmpty()) 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()) 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::fromString(m_fiSettings.value("kmmofx-specificDate"));
} }
return TQDate::tqcurrentDate().addMonths(-2); return TQDate::currentDate().addMonths(-2);
} }
#if LIBOFX_IS_VERSION(0,9,0) #if LIBOFX_IS_VERSION(0,9,0)
@ -356,7 +356,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::message(const TQString& _msgType,
MyMoneyOfxConnector::Tag MyMoneyOfxConnector::investmentRequest(void) const 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]")); TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
return message("INVSTMT","INVSTMT",Tag("INVSTMTRQ") return message("INVSTMT","INVSTMT",Tag("INVSTMTRQ")
@ -387,7 +387,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::creditCardRequest(const TQDate& _d
MyMoneyOfxConnector::Tag MyMoneyOfxConnector::signOn(void) const 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"); Tag fi("FI");
fi.element("ORG",fiorg()); fi.element("ORG",fiorg());
@ -422,7 +422,7 @@ TQString MyMoneyOfxConnector::header(void)
TQString MyMoneyOfxConnector::uuid(void) TQString MyMoneyOfxConnector::uuid(void)
{ {
static int id = 1; 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 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"); Tag sonrs("SONRS");
sonrs sonrs
@ -495,12 +495,12 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::bankStatementResponse(const TQDate
MyMoneyFile* file = MyMoneyFile::instance(); MyMoneyFile* file = MyMoneyFile::instance();
TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); 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; TQString transactionlist;
MyMoneyTransactionFilter filter; MyMoneyTransactionFilter filter;
filter.setDateFilter(_dtstart,TQDate::tqcurrentDate()); filter.setDateFilter(_dtstart,TQDate::currentDate());
filter.addAccount(m_account.id()); filter.addAccount(m_account.id());
TQValueList<MyMoneyTransaction> transactions = file->transactionList(filter); TQValueList<MyMoneyTransaction> transactions = file->transactionList(filter);
TQValueList<MyMoneyTransaction>::const_iterator it_transaction = transactions.begin(); TQValueList<MyMoneyTransaction>::const_iterator it_transaction = transactions.begin();
@ -522,12 +522,12 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::creditCardStatementResponse(const
MyMoneyFile* file = MyMoneyFile::instance(); MyMoneyFile* file = MyMoneyFile::instance();
TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); 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; TQString transactionlist;
MyMoneyTransactionFilter filter; MyMoneyTransactionFilter filter;
filter.setDateFilter(_dtstart,TQDate::tqcurrentDate()); filter.setDateFilter(_dtstart,TQDate::currentDate());
filter.addAccount(m_account.id()); filter.addAccount(m_account.id());
TQValueList<MyMoneyTransaction> transactions = file->transactionList(filter); TQValueList<MyMoneyTransaction> transactions = file->transactionList(filter);
TQValueList<MyMoneyTransaction>::const_iterator it_transaction = transactions.begin(); TQValueList<MyMoneyTransaction>::const_iterator it_transaction = transactions.begin();
@ -549,12 +549,12 @@ TQString MyMoneyOfxConnector::investmentStatementResponse(const TQDate& _dtstart
MyMoneyFile* file = MyMoneyFile::instance(); MyMoneyFile* file = MyMoneyFile::instance();
TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); 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; TQString transactionlist;
MyMoneyTransactionFilter filter; MyMoneyTransactionFilter filter;
filter.setDateFilter(_dtstart,TQDate::tqcurrentDate()); filter.setDateFilter(_dtstart,TQDate::currentDate());
filter.addAccount(m_account.id()); filter.addAccount(m_account.id());
filter.addAccount(m_account.accountList()); filter.addAccount(m_account.accountList());
TQValueList<MyMoneyTransaction> transactions = file->transactionList(filter); TQValueList<MyMoneyTransaction> transactions = file->transactionList(filter);

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

@ -578,7 +578,7 @@ void OfxImporterPlugin::protocols(TQStringList& protocolList) const
TQWidget* OfxImporterPlugin::accountConfigTab(const MyMoneyAccount& acc, TQString& name) TQWidget* OfxImporterPlugin::accountConfigTab(const MyMoneyAccount& acc, TQString& name)
{ {
name = i18n("Online settings"); name = i18n("Online settings");
m_statusDlg = new KOnlineBankingtqStatus(acc, 0, 0); m_statusDlg = new KOnlineBankingStatus(acc, 0, 0);
return m_statusDlg; return m_statusDlg;
} }

4
kmymoney2/plugins/ofximport/ofximporterplugin.h
Unescape View File

@ -35,7 +35,7 @@
// Project Includes // Project Includes
#include "../kmymoneyplugin.h" #include "../kmymoneyplugin.h"
class KOnlineBankingtqStatus; class KOnlineBankingStatus;
/** /**
@author Ace Jones @author Ace Jones
@ -140,7 +140,7 @@ private:
TQStringList m_infos; TQStringList m_infos;
TQStringList m_warnings; TQStringList m_warnings;
TQStringList m_errors; TQStringList m_errors;
KOnlineBankingtqStatus* m_statusDlg; KOnlineBankingStatus* m_statusDlg;
}; };
#endif #endif

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

@ -67,7 +67,7 @@ void setDirectory(const TQString& dir)
bool needReload(const TQFileInfo& i) bool needReload(const TQFileInfo& i)
{ {
return ((!i.isReadable()) return ((!i.isReadable())
|| (i.lastModified().addDays(7) < TQDateTime::tqcurrentDateTime()) || (i.lastModified().addDays(7) < TQDateTime::currentDateTime())
|| (i.size() < 1024)); || (i.size() < 1024));
} }
@ -240,7 +240,7 @@ OfxFiServiceInfo ServiceInfo(const TQString& fipid)
// Increasing to VER=9 solved the problem. This may happen again in the // Increasing to VER=9 solved the problem. This may happen again in the
// future. // future.
TQFileInfo i(guidFile.path()); TQFileInfo i(guidFile.path());
if(!i.isReadable() || i.lastModified().addDays(7) < TQDateTime::tqcurrentDateTime()) if(!i.isReadable() || i.lastModified().addDays(7) < TQDateTime::currentDateTime())
get("", attr, KURL(TQString("http://moneycentral.msn.com/money/2005/mnynet/service/olsvcupd/OnlSvcBrandInfo.aspx?MSNGUID=&GUID=%1&SKU=3&VER=" VER).tqarg(fipid)), guidFile); get("", attr, KURL(TQString("http://moneycentral.msn.com/money/2005/mnynet/service/olsvcupd/OnlSvcBrandInfo.aspx?MSNGUID=&GUID=%1&SKU=3&VER=" VER).tqarg(fipid)), guidFile);
TQFile f(guidFile.path()); TQFile f(guidFile.path());

2
kmymoney2/reports/kreportchartview.cpp
Unescape View File

@ -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 // mouse tracking on will force the mouseMoveEvent() method to be called from TQt
label->setMouseTracking( true ); label->setMouseTracking( true );
label->setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); label->setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised );
label->tqsetAlignment( AlignRight ); label->setAlignment( AlignRight );
label->setAutoResize( true ); label->setAutoResize( true );
} }

8
kmymoney2/reports/objectinfotable.cpp
Unescape View File

@ -157,7 +157,7 @@ void ObjectInfoTable::constructScheduleTable ( void )
//convert to base currency if needed //convert to base currency if needed
MyMoneyMoney xr = MyMoneyMoney(1,1); MyMoneyMoney xr = MyMoneyMoney(1,1);
if (m_config.isConvertCurrency() && account.isForeignCurrency()) { if (m_config.isConvertCurrency() && account.isForeignCurrency()) {
xr = account.baseCurrencyPrice(TQDate::tqcurrentDate()).reduce(); xr = account.baseCurrencyPrice(TQDate::currentDate()).reduce();
} }
// help for sort and render functions // help for sort and render functions
@ -274,7 +274,7 @@ void ObjectInfoTable::constructAccountTable ( void )
//convert to base currency if needed //convert to base currency if needed
if (m_config.isConvertCurrency() && account.isForeignCurrency()) { if (m_config.isConvertCurrency() && account.isForeignCurrency()) {
MyMoneyMoney xr = account.baseCurrencyPrice(TQDate::tqcurrentDate()).reduce(); MyMoneyMoney xr = account.baseCurrencyPrice(TQDate::currentDate()).reduce();
value = value * xr; value = value * xr;
} }
accountRow["currentbalance"] = value.toString(); accountRow["currentbalance"] = value.toString();
@ -306,7 +306,7 @@ void ObjectInfoTable::constructAccountLoanTable ( void )
//convert to base currency if needed //convert to base currency if needed
MyMoneyMoney xr = MyMoneyMoney(1,1); MyMoneyMoney xr = MyMoneyMoney(1,1);
if (m_config.isConvertCurrency() && account.isForeignCurrency()) { if (m_config.isConvertCurrency() && account.isForeignCurrency()) {
xr = account.baseCurrencyPrice(TQDate::tqcurrentDate()).reduce(); xr = account.baseCurrencyPrice(TQDate::currentDate()).reduce();
} }
accountRow["rank"] = "0"; accountRow["rank"] = "0";
@ -321,7 +321,7 @@ void ObjectInfoTable::constructAccountLoanTable ( void )
accountRow["currencyname"] = (file->currency(account.currencyId())).name(); accountRow["currencyname"] = (file->currency(account.currencyId())).name();
accountRow["payee"] = file->payee(loan.payee()).name(); accountRow["payee"] = file->payee(loan.payee()).name();
accountRow["loanamount"] = (loan.loanAmount() * xr).toString(); 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["nextinterestchange"] = loan.nextInterestChange().toString( Qt::ISODate );
accountRow["periodicpayment"] = (loan.periodicPayment() * xr).toString(); accountRow["periodicpayment"] = (loan.periodicPayment() * xr).toString();
accountRow["finalpayment"] = (loan.finalPayment() * xr).toString(); accountRow["finalpayment"] = (loan.finalPayment() * xr).toString();

20
kmymoney2/reports/pivottable.cpp
Unescape View File

@ -230,8 +230,8 @@ void PivotTable::init(void)
while ( it_date != paymentDates.end() ) while ( it_date != paymentDates.end() )
{ {
//if the payment occurs in the past, enter it tomorrow //if the payment occurs in the past, enter it tomorrow
if(TQDate::tqcurrentDate() >= *it_date) { if(TQDate::currentDate() >= *it_date) {
tx.setPostDate(TQDate::tqcurrentDate().addDays(1)); tx.setPostDate(TQDate::currentDate().addDays(1));
} else { } else {
tx.setPostDate(*it_date); tx.setPostDate(*it_date);
} }
@ -286,8 +286,8 @@ void PivotTable::init(void)
TQDate dueDate = sched.nextDueDate(); TQDate dueDate = sched.nextDueDate();
//if the payment is overdue, use current date //if the payment is overdue, use current date
if(dueDate < TQDate::tqcurrentDate()) if(dueDate < TQDate::currentDate())
dueDate = TQDate::tqcurrentDate(); dueDate = TQDate::currentDate();
//get the balance from the file for the date //get the balance from the file for the date
loanBalances[splitAccount.id()] = file->balance(splitAccount.id(), dueDate.addDays(-1)); loanBalances[splitAccount.id()] = file->balance(splitAccount.id(), dueDate.addDays(-1));
@ -831,7 +831,7 @@ void PivotTable::calculateBudgetMapping( void )
TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin(); TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin();
while( budgets_it != budgets.end() ) { while( budgets_it != budgets.end() ) {
//pick the first budget that matches the report start year //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()); budget = file->budget( (*budgets_it).id());
break; break;
} }
@ -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 // 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 // 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) << "futurecolumn: " << futurecolumn << endl;
// kdDebug(2) << "m_numColumns: " << m_numColumns << endl; // kdDebug(2) << "m_numColumns: " << m_numColumns << endl;
@ -2335,10 +2335,10 @@ void PivotTable::calculateForecast(void)
forecast.setIncludeUnusedAccounts(true); forecast.setIncludeUnusedAccounts(true);
//setup forecast dates //setup forecast dates
if(m_endDate > TQDate::tqcurrentDate()) { if(m_endDate > TQDate::currentDate()) {
forecast.setForecastEndDate(m_endDate); forecast.setForecastEndDate(m_endDate);
forecast.setForecastStartDate(TQDate::tqcurrentDate()); forecast.setForecastStartDate(TQDate::currentDate());
forecast.setForecastDays(TQDate::tqcurrentDate().daysTo(m_endDate)); forecast.setForecastDays(TQDate::currentDate().daysTo(m_endDate));
} else { } else {
forecast.setForecastStartDate(m_beginDate); forecast.setForecastStartDate(m_beginDate);
forecast.setForecastEndDate(m_endDate); forecast.setForecastEndDate(m_endDate);
@ -2346,7 +2346,7 @@ void PivotTable::calculateForecast(void)
} }
//adjust history dates if beginning date is before today //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.setHistoryEndDate(m_beginDate.addDays(-1));
forecast.setHistoryStartDate(forecast.historyEndDate().addDays(-forecast.accountsCycle()*forecast.forecastCycles())); forecast.setHistoryStartDate(forecast.historyEndDate().addDays(-forecast.accountsCycle()*forecast.forecastCycles()));
} }

2
kmymoney2/reports/querytable.cpp
Unescape View File

@ -59,7 +59,7 @@ namespace reports {
// //
// **************************************************************************** // ****************************************************************************
TQDate CashFlowListItem::m_sToday = TQDate::tqcurrentDate(); TQDate CashFlowListItem::m_sToday = TQDate::currentDate();
MyMoneyMoney CashFlowListItem::NPV( double _rate ) const MyMoneyMoney CashFlowListItem::NPV( double _rate ) const
{ {

6
kmymoney2/views/kaccountsviewdecl.ui
Unescape View File

@ -85,7 +85,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>515</width> <width>515</width>
<height>20</height> <height>20</height>
@ -153,7 +153,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>367</width> <width>367</width>
<height>20</height> <height>20</height>
@ -164,7 +164,7 @@
<property name="name"> <property name="name">
<cstring>m_totalProfitsLabel</cstring> <cstring>m_totalProfitsLabel</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>0</height> <height>0</height>

2
kmymoney2/views/kbudgetview.cpp
Unescape View File

@ -230,7 +230,7 @@ void KBudgetView::loadBudgets(void)
m_budgetValue->clear(); m_budgetValue->clear();
// add the correct years to the drop down list // 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; int iStartYear = date.year() - m_iBudgetYearsBack;
m_yearList.clear(); m_yearList.clear();

2
kmymoney2/views/kbudgetviewdecl.ui
Unescape View File

@ -304,7 +304,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>

6
kmymoney2/views/kcategoriesviewdecl.ui
Unescape View File

@ -67,7 +67,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>515</width> <width>515</width>
<height>20</height> <height>20</height>
@ -102,7 +102,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>310</width> <width>310</width>
<height>16</height> <height>16</height>
@ -113,7 +113,7 @@
<property name="name"> <property name="name">
<cstring>m_totalProfitsLabel</cstring> <cstring>m_totalProfitsLabel</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>0</height> <height>0</height>

14
kmymoney2/views/kforecastview.cpp
Unescape View File

@ -68,7 +68,7 @@ KForecastView::KForecastView(TQWidget *parent, const char *name) :
m_advancedList->setAllColumnsShowFocus(true); m_advancedList->setAllColumnsShowFocus(true);
m_forecastChart = new KReportChartView(m_tabChart, "forecastChart" ); m_forecastChart = new KReportChartView(m_tabChart, "forecastChart" );
m_forecastChart->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); m_forecastChart->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
loadForecastSettings(); loadForecastSettings();
@ -393,8 +393,8 @@ void KForecastView::loadAdvancedView(void)
int accountColumn = m_advancedList->addColumn(i18n("Account"), -1); 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 beginning of forecast is today, set the begin day to next cycle to avoid repeating the first cycle
if(TQDate::tqcurrentDate() < forecast.beginForecastDate()) { if(TQDate::currentDate() < forecast.beginForecastDate()) {
daysToBeginDay = TQDate::tqcurrentDate().daysTo(forecast.beginForecastDate()); daysToBeginDay = TQDate::currentDate().daysTo(forecast.beginForecastDate());
} else { } else {
daysToBeginDay = forecast.accountsCycle(); daysToBeginDay = forecast.accountsCycle();
} }
@ -486,10 +486,10 @@ void KForecastView::loadBudgetView(void)
m_budgetList->setBaseCurrency(file->baseCurrency()); m_budgetList->setBaseCurrency(file->baseCurrency());
//get the settings from current page and calculate this year based on last year //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 historyStartDate = historyEndDate.addDays(-m_accountsCycle->value() * m_forecastCycles->value());
TQDate forecastStartDate = TQDate(TQDate::tqcurrentDate().year(), 1, 1); TQDate forecastStartDate = TQDate(TQDate::currentDate().year(), 1, 1);
TQDate forecastEndDate = TQDate::tqcurrentDate().addDays(m_forecastDays->value()); TQDate forecastEndDate = TQDate::currentDate().addDays(m_forecastDays->value());
forecast.setHistoryMethod(m_historyMethod->selectedId()); forecast.setHistoryMethod(m_historyMethod->selectedId());
MyMoneyBudget budget; MyMoneyBudget budget;
@ -658,7 +658,7 @@ void KForecastView::loadChartView(void)
reportCfg.setColumnsAreDays( true ); reportCfg.setColumnsAreDays( true );
reportCfg.setConvertCurrency( true ); reportCfg.setConvertCurrency( true );
reportCfg.setIncludingForecast( 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); reports::PivotTable table(reportCfg);

6
kmymoney2/views/kforecastviewdecl.ui
Unescape View File

@ -189,7 +189,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>31</height> <height>31</height>
@ -312,7 +312,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>6</height> <height>6</height>
@ -345,7 +345,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>21</height> <height>21</height>

20
kmymoney2/views/kgloballedgerview.cpp
Unescape View File

@ -176,7 +176,7 @@ KGlobalLedgerView::KGlobalLedgerView(TQWidget *parent, const char *name )
//m_toolbar->setMaximumSize(50,20); //m_toolbar->setMaximumSize(50,20);
m_toolbar->alignItemRight(1); m_toolbar->alignItemRight(1);
#endif #endif
m_toolbar->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); m_toolbar->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
tqlayout()->addWidget(m_toolbarFrame); tqlayout()->addWidget(m_toolbarFrame);
// create the register frame // create the register frame
@ -448,7 +448,7 @@ void KGlobalLedgerView::loadView(void)
// show scheduled transactions which have a scheduled postdate // show scheduled transactions which have a scheduled postdate
// within the next 'period' days. In reconciliation mode, the // within the next 'period' days. In reconciliation mode, the
// period starts on the statement date. // period starts on the statement date.
TQDate endDate = TQDate::tqcurrentDate().addDays(period); TQDate endDate = TQDate::currentDate().addDays(period);
if(isReconciliationAccount()) if(isReconciliationAccount())
endDate = reconciliationDate.addDays(period); endDate = reconciliationDate.addDays(period);
TQValueList<MyMoneySchedule> scheduleList = MyMoneyFile::instance()->scheduleList(m_account.id()); 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 // certainly be posted in the past. So we take todays date
// as the alternative // as the alternative
if(s.isOverdue()) if(s.isOverdue())
t.setPostDate(TQDate::tqcurrentDate()); t.setPostDate(TQDate::currentDate());
else else
t.setPostDate(s.adjustedNextDueDate()); t.setPostDate(s.adjustedNextDueDate());
const TQValueList<MyMoneySplit>& splits = t.splits(); const TQValueList<MyMoneySplit>& splits = t.splits();
@ -476,7 +476,7 @@ void KGlobalLedgerView::loadView(void)
} }
// keep track of this payment locally (not in the engine) // keep track of this payment locally (not in the engine)
if(s.isOverdue()) if(s.isOverdue())
s.setLastPayment(TQDate::tqcurrentDate()); s.setLastPayment(TQDate::currentDate());
else else
s.setLastPayment(s.nextDueDate()); 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()); 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; actBalance[split.accountId()] -= split.shares() * factor;
} }
@ -1149,12 +1149,12 @@ TransactionEditor* KGlobalLedgerView::startEdit(const KMyMoneyRegister::Selected
// Check if the editor has some preference on where to set the focus // 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 // If not, set the focus to the first widget in the tab order
TQWidget* tqfocusWidget = editor->firstWidget(); TQWidget* focusWidget = editor->firstWidget();
if(!tqfocusWidget) if(!focusWidget)
tqfocusWidget = m_tabOrderWidgets.first(); focusWidget = m_tabOrderWidgets.first();
// for some reason, this only works reliably if delayed a bit // 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. // preset to 'I have no idea which type to create' for the next round.
d->m_action = KMyMoneyRegister::ActionNone; d->m_action = KMyMoneyRegister::ActionNone;
@ -1207,7 +1207,7 @@ bool KGlobalLedgerView::focusNextPrevChild(bool next)
TQWidget *w = 0; TQWidget *w = 0;
TQWidget *currentWidget; TQWidget *currentWidget;
w = tqApp->tqfocusWidget(); w = tqApp->focusWidget();
while(w && m_tabOrderWidgets.find(w) == -1) { while(w && m_tabOrderWidgets.find(w) == -1) {
// qDebug("'%s' not in list, use parent", w->className()); // qDebug("'%s' not in list, use parent", w->className());
w = w->parentWidget(); w = w->parentWidget();

56
kmymoney2/views/khomeview.cpp
Unescape View File

@ -311,7 +311,7 @@ void KHomeView::showNetWorthGraph(void)
reportCfg.setColumnsAreDays( true ); reportCfg.setColumnsAreDays( true );
reportCfg.setConvertCurrency( true ); reportCfg.setConvertCurrency( true );
reportCfg.setIncludingForecast( true ); reportCfg.setIncludingForecast( true );
reportCfg.setDateFilter(TQDate::tqcurrentDate(),TQDate::tqcurrentDate().addDays(+90)); reportCfg.setDateFilter(TQDate::currentDate(),TQDate::currentDate().addDays(+90));
reports::PivotTable table(reportCfg); reports::PivotTable table(reportCfg);
@ -383,8 +383,8 @@ void KHomeView::showPayments(void)
schedule = file->scheduleList("", MyMoneySchedule::TYPE_ANY, schedule = file->scheduleList("", MyMoneySchedule::TYPE_ANY,
MyMoneySchedule::OCCUR_ANY, MyMoneySchedule::OCCUR_ANY,
MyMoneySchedule::STYPE_ANY, MyMoneySchedule::STYPE_ANY,
TQDate::tqcurrentDate(), TQDate::currentDate(),
TQDate::tqcurrentDate().addMonths(1)); TQDate::currentDate().addMonths(1));
overdues = file->scheduleList("", MyMoneySchedule::TYPE_ANY, overdues = file->scheduleList("", MyMoneySchedule::TYPE_ANY,
MyMoneySchedule::OCCUR_ANY, MyMoneySchedule::OCCUR_ANY,
MyMoneySchedule::STYPE_ANY, MyMoneySchedule::STYPE_ANY,
@ -455,7 +455,7 @@ void KHomeView::showPayments(void)
// determine number of overdue payments // determine number of overdue payments
TQDate nextDate = (*it).adjustedNextDueDate(); TQDate nextDate = (*it).adjustedNextDueDate();
int cnt = 0; int cnt = 0;
while(nextDate.isValid() && nextDate < TQDate::tqcurrentDate()) { while(nextDate.isValid() && nextDate < TQDate::currentDate()) {
++cnt; ++cnt;
nextDate = (*it).nextPayment(nextDate); nextDate = (*it).nextPayment(nextDate);
// for single occurence nextDate will not change, so we // for single occurence nextDate will not change, so we
@ -486,12 +486,12 @@ void KHomeView::showPayments(void)
TQValueList<MyMoneySchedule> todays; TQValueList<MyMoneySchedule> todays;
TQValueList<MyMoneySchedule>::Iterator t_it; TQValueList<MyMoneySchedule>::Iterator t_it;
for (t_it=schedule.begin(); t_it!=schedule.end();) { 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); todays.append(*t_it);
(*t_it).setNextDueDate((*t_it).nextPayment((*t_it).nextDueDate())); (*t_it).setNextDueDate((*t_it).nextPayment((*t_it).nextDueDate()));
//if nextDueDate is still tqcurrentDate then remove it from scheduled payments //if nextDueDate is still currentDate then remove it from scheduled payments
if ((*t_it).nextDueDate() == TQDate::tqcurrentDate()) { if ((*t_it).nextDueDate() == TQDate::currentDate()) {
t_it = schedule.remove(t_it); t_it = schedule.remove(t_it);
continue; continue;
} }
@ -560,7 +560,7 @@ void KHomeView::showPayments(void)
cnt = (m_showAllSchedules) ? -1 : 6; cnt = (m_showAllSchedules) ? -1 : 6;
bool needMoreLess = m_showAllSchedules; bool needMoreLess = m_showAllSchedules;
TQDate lastDate = TQDate::tqcurrentDate().addMonths(1); TQDate lastDate = TQDate::currentDate().addMonths(1);
qBubbleSort(schedule); qBubbleSort(schedule);
do { do {
it = schedule.begin(); it = schedule.begin();
@ -812,7 +812,7 @@ void KHomeView::showAccountEntry(const MyMoneyAccount& acc)
showAccountEntry(acc, value, MyMoneyMoney(), showLimit); showAccountEntry(acc, value, MyMoneyMoney(), showLimit);
} else { } else {
//get balance for normal accounts //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 credit card or checkings account, show maximum credit
if( acc.accountType() == MyMoneyAccount::CreditCard || if( acc.accountType() == MyMoneyAccount::CreditCard ||
@ -955,7 +955,7 @@ void KHomeView::showForecast(void)
int colspan = 1; int colspan = 1;
// get begin day // 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 begin day is today skip to next cycle
if(beginDay == 0) if(beginDay == 0)
beginDay = m_forecast.accountsCycle(); beginDay = m_forecast.accountsCycle();
@ -1003,7 +1003,7 @@ void KHomeView::showForecast(void)
} }
for (int f = beginDay; f <= m_forecast.forecastDays(); f += m_forecast.accountsCycle()) { 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; TQString amount;
amount = forecastBalance.formatMoney( *it_account, currency); amount = forecastBalance.formatMoney( *it_account, currency);
amount.replace(" ","&nbsp;"); amount.replace(" ","&nbsp;");
@ -1268,12 +1268,12 @@ void KHomeView::showAssetsLiabilities(void)
if( (*asset_it).accountType() == MyMoneyAccount::Investment) { if( (*asset_it).accountType() == MyMoneyAccount::Investment) {
value = investmentBalance(*asset_it); value = investmentBalance(*asset_it);
} else { } 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 //calculate balance for foreign currency accounts
if((*asset_it).currencyId() != file->baseCurrency().id()) { if((*asset_it).currencyId() != file->baseCurrency().id()) {
ReportAccount repAcc = ReportAccount((*asset_it).id()); ReportAccount repAcc = ReportAccount((*asset_it).id());
MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::tqcurrentDate()); MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::currentDate());
MyMoneyMoney baseValue = value * curPrice; MyMoneyMoney baseValue = value * curPrice;
baseValue = baseValue.convert(10000); baseValue = baseValue.convert(10000);
netAssets += baseValue; netAssets += baseValue;
@ -1294,11 +1294,11 @@ void KHomeView::showAssetsLiabilities(void)
//write a liability account //write a liability account
if(liabilities_it != nameLiabilitiesIdx.end()) { if(liabilities_it != nameLiabilitiesIdx.end()) {
MyMoneyMoney value; 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 //calculate balance if foreign currency
if((*liabilities_it).currencyId() != file->baseCurrency().id()) { if((*liabilities_it).currencyId() != file->baseCurrency().id()) {
ReportAccount repAcc = ReportAccount((*liabilities_it).id()); ReportAccount repAcc = ReportAccount((*liabilities_it).id());
MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::tqcurrentDate()); MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::currentDate());
MyMoneyMoney baseValue = value * curPrice; MyMoneyMoney baseValue = value * curPrice;
baseValue = baseValue.convert(10000); baseValue = baseValue.convert(10000);
netLiabilities += baseValue; netLiabilities += baseValue;
@ -1518,16 +1518,16 @@ void KHomeView::doForecast(void)
MyMoneyMoney KHomeView::forecastPaymentBalance(const MyMoneyAccount& acc, const MyMoneyMoney& payment, TQDate& paymentDate) 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 //so we get to accumulate forecast balance correctly
if(paymentDate <= TQDate::tqcurrentDate()) if(paymentDate <= TQDate::currentDate())
paymentDate = TQDate::tqcurrentDate().addDays(1); paymentDate = TQDate::currentDate().addDays(1);
//check if the account is already there //check if the account is already there
if(m_accountList.find(acc.id()) == m_accountList.end() if(m_accountList.find(acc.id()) == m_accountList.end()
|| m_accountList[acc.id()].find(paymentDate) == m_accountList[acc.id()].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); m_accountList[acc.id()][paymentDate] = m_forecast.forecastBalance(acc, paymentDate);
} else { } else {
m_accountList[acc.id()][paymentDate] = m_forecast.forecastBalance(acc, paymentDate.addDays(-1)); 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()); int prec = MyMoneyMoney::denomToPrec(file->baseCurrency().smallestAccountFraction());
//set start and end of month dates //set start and end of month dates
TQDate startOfMonth = TQDate(TQDate::tqcurrentDate().year(), TQDate::tqcurrentDate().month(), 1); TQDate startOfMonth = TQDate(TQDate::currentDate().year(), TQDate::currentDate().month(), 1);
TQDate endOfMonth = TQDate(TQDate::tqcurrentDate().year(), TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().daysInMonth()); TQDate endOfMonth = TQDate(TQDate::currentDate().year(), TQDate::currentDate().month(), TQDate::currentDate().daysInMonth());
//Add total income and expenses for this month //Add total income and expenses for this month
//get transactions for current month //get transactions for current month
@ -1660,8 +1660,8 @@ void KHomeView::showCashFlowSummary()
MyMoneyAccount acc = file->account((*it_s).accountId()); MyMoneyAccount acc = file->account((*it_s).accountId());
// collect all overdues on the first day // collect all overdues on the first day
TQDate schedDate = nextDate; TQDate schedDate = nextDate;
if(TQDate::tqcurrentDate() >= nextDate) if(TQDate::currentDate() >= nextDate)
schedDate = TQDate::tqcurrentDate().addDays(1); schedDate = TQDate::currentDate().addDays(1);
balanceMap[acc.id()] += file->balance(acc.id()); balanceMap[acc.id()] += file->balance(acc.id());
} }
@ -1680,7 +1680,7 @@ void KHomeView::showCashFlowSummary()
//convert to foreign currency if needed //convert to foreign currency if needed
if(repSplitAcc.currencyId() != file->baseCurrency().id()) { if(repSplitAcc.currencyId() != file->baseCurrency().id()) {
MyMoneyMoney curPrice = repSplitAcc.baseCurrencyPrice(TQDate::tqcurrentDate()); MyMoneyMoney curPrice = repSplitAcc.baseCurrencyPrice(TQDate::currentDate());
value = value * curPrice; value = value * curPrice;
value = value.convert(10000); value = value.convert(10000);
} }
@ -1733,11 +1733,11 @@ void KHomeView::showCashFlowSummary()
case MyMoneyAccount::Savings: case MyMoneyAccount::Savings:
case MyMoneyAccount::Cash: 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 //calculate balance for foreign currency accounts
if((*account_it).currencyId() != file->baseCurrency().id()) { if((*account_it).currencyId() != file->baseCurrency().id()) {
ReportAccount repAcc = ReportAccount((*account_it).id()); ReportAccount repAcc = ReportAccount((*account_it).id());
MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::tqcurrentDate()); MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::currentDate());
MyMoneyMoney baseValue = value * curPrice; MyMoneyMoney baseValue = value * curPrice;
liquidAssets += baseValue; liquidAssets += baseValue;
liquidAssets = liquidAssets.convert(10000); liquidAssets = liquidAssets.convert(10000);
@ -1750,11 +1750,11 @@ void KHomeView::showCashFlowSummary()
case MyMoneyAccount::CreditCard: case MyMoneyAccount::CreditCard:
{ {
MyMoneyMoney value; 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 //calculate balance if foreign currency
if((*account_it).currencyId() != file->baseCurrency().id()) { if((*account_it).currencyId() != file->baseCurrency().id()) {
ReportAccount repAcc = ReportAccount((*account_it).id()); ReportAccount repAcc = ReportAccount((*account_it).id());
MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::tqcurrentDate()); MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::currentDate());
MyMoneyMoney baseValue = value * curPrice; MyMoneyMoney baseValue = value * curPrice;
liquidLiabilities += baseValue; liquidLiabilities += baseValue;
liquidLiabilities = liquidLiabilities.convert(10000); liquidLiabilities = liquidLiabilities.convert(10000);

4
kmymoney2/views/kinstitutionsviewdecl.ui
Unescape View File

@ -45,7 +45,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -56,7 +56,7 @@
<property name="name"> <property name="name">
<cstring>m_totalProfitsLabel</cstring> <cstring>m_totalProfitsLabel</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>0</height> <height>0</height>

6
kmymoney2/views/kinvestmentlistitem.cpp
Unescape View File

@ -130,7 +130,7 @@ const TQString KInvestmentListItem::calculateGain(const equity_price_history& hi
else else
{ {
bool bFoundCurrent = false, bFoundComparison = false; bool bFoundCurrent = false, bFoundComparison = false;
TQDate tempDate, comparisonDate = TQDate::tqcurrentDate(); TQDate tempDate, comparisonDate = TQDate::currentDate();
if(YTD) 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. //find the current value, or closest to the current value.
equity_price_history::ConstIterator itToday = history.end(); equity_price_history::ConstIterator itToday = history.end();
for(tempDate = TQDate::tqcurrentDate(); tempDate >= comparisonDate; ) for(tempDate = TQDate::currentDate(); tempDate >= comparisonDate; )
{ {
itToday = history.find(tempDate); itToday = history.find(tempDate);
if(itToday != history.end()) if(itToday != history.end())
@ -169,7 +169,7 @@ const TQString KInvestmentListItem::calculateGain(const equity_price_history& hi
//should already be sorted earliest to latest. //should already be sorted earliest to latest.
for(equity_price_history::ConstIterator it = history.begin(); it != history.end(); ++it) 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(); comparisonDate = it.key();
comparisonValue = it.data(); comparisonValue = it.data();

2
kmymoney2/views/kinvestmentviewdecl.ui
Unescape View File

@ -53,7 +53,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>280</width> <width>280</width>
<height>20</height> <height>20</height>

2
kmymoney2/views/kmymoneyview.cpp
Unescape View File

@ -1054,7 +1054,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter
ft.commit(); ft.commit();
pWriter->setProgressCallback(&KMyMoneyView::progressCallback); pWriter->setProgressCallback(&KMyMoneyView::progressCallback);
dev->resetqStatus(); dev->reseStatus();
pWriter->writeFile(dev, dynamic_cast<IMyMoneySerialize*> (MyMoneyFile::instance()->storage())); pWriter->writeFile(dev, dynamic_cast<IMyMoneySerialize*> (MyMoneyFile::instance()->storage()));
MyMoneyFile::instance()->blockSignals(blocked); MyMoneyFile::instance()->blockSignals(blocked);
if(statusDevice->status() != IO_Ok) { if(statusDevice->status() != IO_Ok) {

2
kmymoney2/views/kpayeesview.cpp
Unescape View File

@ -325,7 +325,7 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) :
// create the searchline widget // create the searchline widget
// and insert it into the existing tqlayout // and insert it into the existing tqlayout
m_searchWidget = new KListViewSearchLineWidget(m_payeesList, this); 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); KPayeesViewDeclLayout->insertWidget(0, m_searchWidget);
m_splitter = new TQSplitter(this); m_splitter = new TQSplitter(this);

18
kmymoney2/views/kpayeesviewdecl.ui
Unescape View File

@ -218,7 +218,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>
<height>0</height> <height>0</height>
@ -240,7 +240,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>
<height>0</height> <height>0</height>
@ -262,7 +262,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>
<height>0</height> <height>0</height>
@ -284,7 +284,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>
<height>0</height> <height>0</height>
@ -350,7 +350,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>
<height>0</height> <height>0</height>
@ -375,7 +375,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -516,7 +516,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -586,7 +586,7 @@ new transactions with this payee</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>31</height> <height>31</height>
@ -632,7 +632,7 @@ new transactions with this payee</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>260</width> <width>260</width>
<height>21</height> <height>21</height>

4
kmymoney2/views/kreportsview.cpp
Unescape View File

@ -105,7 +105,7 @@ KReportsView::KReportTab::KReportTab(KTabWidget* parent, const MyMoneyReport& re
m_control->buttonChart->hide(); m_control->buttonChart->hide();
} }
m_chartView->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); m_chartView->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
m_chartView->hide(); m_chartView->hide();
m_layout->addWidget( m_control ); //, 0, TQt::AlignTop ); m_layout->addWidget( m_control ); //, 0, TQt::AlignTop );
m_layout->addWidget( m_part->view() ); m_layout->addWidget( m_part->view() );
@ -1350,7 +1350,7 @@ void KReportsView::defaultReports(TQValueList<ReportGroup>& groups)
list.back().setShowingRowTotals(true); list.back().setShowingRowTotals(true);
list.back().setBudget("Any",true); list.back().setBudget("Any",true);
// in case we're in January, we show the last year // 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); list.back().setDateFilter(MyMoneyTransactionFilter::lastYear);
} }

2
kmymoney2/views/kscheduledviewdecl.ui
Unescape View File

@ -45,7 +45,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>20</height> <height>20</height>

16
kmymoney2/widgets/kaccounttemplateselectordecl.cpp
Unescape View File

@ -39,7 +39,7 @@ KAccountTemplateSelectorDecl::KAccountTemplateSelectorDecl( TQWidget* parent, co
m_groupList = new KListView( this, "m_groupList" ); m_groupList = new KListView( this, "m_groupList" );
m_groupList->addColumn( kmm_i18n( "Account Types" ) ); m_groupList->addColumn( kmm_i18n( "Account Types" ) );
m_groupList->addColumn( kmm_i18n( "Description" ) ); 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->setMinimumSize( TQSize( 0, 150 ) );
m_groupList->setProperty( "selectionMode", "Extended" ); m_groupList->setProperty( "selectionMode", "Extended" );
m_groupList->setAllColumnsShowFocus( TRUE ); m_groupList->setAllColumnsShowFocus( TRUE );
@ -50,30 +50,30 @@ KAccountTemplateSelectorDecl::KAccountTemplateSelectorDecl( TQWidget* parent, co
tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3"); tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3");
groupBox1 = new TQGroupBox( this, "groupBox1" ); 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->setColumnLayout(0, Qt::Vertical );
groupBox1->tqlayout()->setSpacing( 6 ); groupBox1->tqlayout()->setSpacing( 6 );
groupBox1->tqlayout()->setMargin( 11 ); groupBox1->tqlayout()->setMargin( 11 );
groupBox1Layout = new TQVBoxLayout( groupBox1->tqlayout() ); groupBox1Layout = new TQVBoxLayout( groupBox1->tqlayout() );
groupBox1Layout->tqsetAlignment( TQt::AlignTop ); groupBox1Layout->setAlignment( TQt::AlignTop );
m_description = new KTextEdit( groupBox1, "m_description" ); 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 ); m_description->setReadOnly( TRUE );
groupBox1Layout->addWidget( m_description ); groupBox1Layout->addWidget( m_description );
tqlayout3->addWidget( groupBox1 ); tqlayout3->addWidget( groupBox1 );
groupBox2 = new TQGroupBox( this, "groupBox2" ); 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->setColumnLayout(0, Qt::Vertical );
groupBox2->tqlayout()->setSpacing( 6 ); groupBox2->tqlayout()->setSpacing( 6 );
groupBox2->tqlayout()->setMargin( 11 ); groupBox2->tqlayout()->setMargin( 11 );
groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
groupBox2Layout->tqsetAlignment( TQt::AlignTop ); groupBox2Layout->setAlignment( TQt::AlignTop );
m_accountList = new KListView( groupBox2, "m_accountList" ); m_accountList = new KListView( groupBox2, "m_accountList" );
m_accountList->addColumn( kmm_i18n( "Name" ) ); 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->setMinimumSize( TQSize( 0, 150 ) );
m_accountList->setProperty( "selectionMode", "NoSelection" ); m_accountList->setProperty( "selectionMode", "NoSelection" );
m_accountList->setAllColumnsShowFocus( TRUE ); m_accountList->setAllColumnsShowFocus( TRUE );
@ -83,7 +83,7 @@ KAccountTemplateSelectorDecl::KAccountTemplateSelectorDecl( TQWidget* parent, co
tqlayout3->addWidget( groupBox2 ); tqlayout3->addWidget( groupBox2 );
KAccountTemplateSelectorDeclLayout->addLayout( tqlayout3 ); KAccountTemplateSelectorDeclLayout->addLayout( tqlayout3 );
languageChange(); languageChange();
resize( TQSize(546, 346).expandedTo(tqminimumSizeHint()) ); resize( TQSize(546, 346).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished ); clearWState( WState_Polished );
} }

4
kmymoney2/widgets/kaccounttemplateselectordecl.ui
Unescape View File

@ -53,7 +53,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>150</height> <height>150</height>
@ -159,7 +159,7 @@
<verstretch>3</verstretch> <verstretch>3</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>150</height> <height>150</height>

4
kmymoney2/widgets/kbudgetvaluesdecl.cpp
Unescape View File

@ -183,7 +183,7 @@ KBudgetValuesDecl::KBudgetValuesDecl( TQWidget* parent, const char* name, WFlags
m_periodGroup->tqlayout()->setSpacing( 6 ); m_periodGroup->tqlayout()->setSpacing( 6 );
m_periodGroup->tqlayout()->setMargin( 11 ); m_periodGroup->tqlayout()->setMargin( 11 );
m_periodGroupLayout = new TQVBoxLayout( m_periodGroup->tqlayout() ); m_periodGroupLayout = new TQVBoxLayout( m_periodGroup->tqlayout() );
m_periodGroupLayout->tqsetAlignment( TQt::AlignTop ); m_periodGroupLayout->setAlignment( TQt::AlignTop );
m_monthlyButton = new TQRadioButton( m_periodGroup, "m_monthlyButton" ); m_monthlyButton = new TQRadioButton( m_periodGroup, "m_monthlyButton" );
m_periodGroupLayout->addWidget( 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 ); KBudgetValuesDeclLayout->addMultiCellWidget( m_periodGroup, 0, 5, 0, 0 );
languageChange(); languageChange();
resize( TQSize(553, 188).expandedTo(tqminimumSizeHint()) ); resize( TQSize(553, 188).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished ); clearWState( WState_Polished );
// tab order // tab order

4
kmymoney2/widgets/kbudgetvaluesdecl.ui
Unescape View File

@ -306,7 +306,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>
@ -360,7 +360,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>

4
kmymoney2/widgets/kguiutils.cpp
Unescape View File

@ -96,7 +96,7 @@ void kMandatoryFieldGroup::add(TQWidget *widget)
void kMandatoryFieldGroup::remove(TQWidget *widget) void kMandatoryFieldGroup::remove(TQWidget *widget)
{ {
widget->setPaletteBackgroundColor(widget->tqcolorGroup().background()); widget->setPaletteBackgroundColor(widget->colorGroup().background());
widgets.remove(widget); widgets.remove(widget);
changed(); changed();
} }
@ -164,7 +164,7 @@ void kMandatoryFieldGroup::clear(void)
{ {
TQValueList<TQWidget *>::Iterator i; TQValueList<TQWidget *>::Iterator i;
for (i = widgets.begin(); i != widgets.end(); ++i) for (i = widgets.begin(); i != widgets.end(); ++i)
(*i)->setPaletteBackgroundColor((*i)->tqcolorGroup().background()); (*i)->setPaletteBackgroundColor((*i)->colorGroup().background());
widgets.clear(); widgets.clear();
if (okButton) { if (okButton) {
okButton->setEnabled(true); okButton->setEnabled(true);

2
kmymoney2/widgets/klistviewsearchline.cpp
Unescape View File

@ -147,7 +147,7 @@ void KListViewSearchLine::updateSearch(const TQString &s)
it.current() && !currentItem; it.current() && !currentItem;
++it) ++it)
{ {
if(d->listView->tqitemRect(it.current()).isValid()) if(d->listView->itemRect(it.current()).isValid())
currentItem = it.current(); currentItem = it.current();
} }
} }

6
kmymoney2/widgets/kmymoneyaccounttreebase.cpp
Unescape View File

@ -238,7 +238,7 @@ bool KMyMoneyAccountTreeBase::acceptDrag(TQDropEvent* event) const
if((rc = (acceptDrops()) && (event->source() == viewport()))) { if((rc = (acceptDrops()) && (event->source() == viewport()))) {
rc = false; rc = false;
KMyMoneyAccountTreeBaseItem* to = dynamic_cast<KMyMoneyAccountTreeBaseItem*>(itemAt( contentsToViewport(event->pos()) )); 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); const KMyMoneyAccountTreeBaseItem* from = findItem(fromId);
// we can only move accounts around // we can only move accounts around
@ -296,7 +296,7 @@ void KMyMoneyAccountTreeBase::slotObjectDropped(TQDropEvent* event, TQListViewIt
KMyMoneyAccountTreeBaseItem* newParent = dynamic_cast<KMyMoneyAccountTreeBaseItem*>(m_dropItem); KMyMoneyAccountTreeBaseItem* newParent = dynamic_cast<KMyMoneyAccountTreeBaseItem*>(m_dropItem);
if(newParent) { if(newParent) {
TQString fromId(event->tqencodedData("text/plain")); TQString fromId(event->encodedData("text/plain"));
const KMyMoneyAccountTreeBaseItem* from = findItem(fromId); const KMyMoneyAccountTreeBaseItem* from = findItem(fromId);
// we can only move accounts around // we can only move accounts around
@ -514,7 +514,7 @@ void KMyMoneyAccountTreeBase::viewportPaintEvent(TQPaintEvent* e)
TQPainter painter(viewport()); TQPainter painter(viewport());
// This is where we actually draw the drop-highlighter // 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); TQStyle::Style_FocusAtBorder);
} }
} }

20
kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
Unescape View File

@ -57,8 +57,8 @@ void KMyMoneyAccountTreeForecast::showSummary(MyMoneyForecast& forecast)
addColumn(i18n("Current"), -1); addColumn(i18n("Current"), -1);
//if beginning of forecast is today, set the begin day to next cycle to avoid repeating the first cycle //if beginning of forecast is today, set the begin day to next cycle to avoid repeating the first cycle
if(TQDate::tqcurrentDate() < forecast.beginForecastDate()) { if(TQDate::currentDate() < forecast.beginForecastDate()) {
daysToBeginDay = TQDate::tqcurrentDate().daysTo(forecast.beginForecastDate()); daysToBeginDay = TQDate::currentDate().daysTo(forecast.beginForecastDate());
} else { } else {
daysToBeginDay = forecast.accountsCycle(); daysToBeginDay = forecast.accountsCycle();
} }
@ -84,7 +84,7 @@ void KMyMoneyAccountTreeForecast::showDetailed(MyMoneyForecast& forecast)
addColumn(i18n("Current"), -1); addColumn(i18n("Current"), -1);
for(int i = 1; i <= forecast.forecastDays(); ++i) { 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); TQString columnName = KGlobal::locale()->formatDate(forecastDate, true);
addColumn(columnName, -1); addColumn(columnName, -1);
} }
@ -103,8 +103,8 @@ void KMyMoneyAccountTreeForecast::showAdvanced(MyMoneyForecast& forecast)
int daysToBeginDay; int daysToBeginDay;
//if beginning of forecast is today, set the begin day to next cycle to avoid repeating the first cycle //if beginning of forecast is today, set the begin day to next cycle to avoid repeating the first cycle
if(TQDate::tqcurrentDate() < forecast.beginForecastDate()) { if(TQDate::currentDate() < forecast.beginForecastDate()) {
daysToBeginDay = TQDate::tqcurrentDate().daysTo(forecast.beginForecastDate()); daysToBeginDay = TQDate::currentDate().daysTo(forecast.beginForecastDate());
} else { } else {
daysToBeginDay = forecast.accountsCycle(); daysToBeginDay = forecast.accountsCycle();
} }
@ -205,8 +205,8 @@ void KMyMoneyAccountTreeForecastItem::updateSummary()
MyMoneyFile* file = MyMoneyFile::instance(); MyMoneyFile* file = MyMoneyFile::instance();
int daysToBeginDay; int daysToBeginDay;
if(TQDate::tqcurrentDate() < m_forecast.beginForecastDate()) { if(TQDate::currentDate() < m_forecast.beginForecastDate()) {
daysToBeginDay = TQDate::tqcurrentDate().daysTo(m_forecast.beginForecastDate()); daysToBeginDay = TQDate::currentDate().daysTo(m_forecast.beginForecastDate());
} else { } else {
daysToBeginDay = m_forecast.accountsCycle(); daysToBeginDay = m_forecast.accountsCycle();
} }
@ -221,7 +221,7 @@ void KMyMoneyAccountTreeForecastItem::updateSummary()
//add current balance column //add current balance column
TQDate summaryDate = TQDate::tqcurrentDate(); TQDate summaryDate = TQDate::currentDate();
amountMM = m_forecast.forecastBalance(m_account, summaryDate); amountMM = m_forecast.forecastBalance(m_account, summaryDate);
//calculate the balance in base currency for the total row //calculate the balance in base currency for the total row
@ -231,7 +231,7 @@ void KMyMoneyAccountTreeForecastItem::updateSummary()
it_c++; it_c++;
//iterate through all other columns //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); amountMM = m_forecast.forecastBalance(m_account, summaryDate);
//calculate the balance in base currency for the total row //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 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); MyMoneyMoney amountMM = m_forecast.forecastBalance(m_account, forecastDate);
//calculate the balance in base currency for the total row //calculate the balance in base currency for the total row

10
kmymoney2/widgets/kmymoneybriefschedule.cpp
Unescape View File

@ -47,8 +47,8 @@ KMyMoneyBriefSchedule::KMyMoneyBriefSchedule(TQWidget *parent, const char *name
: kScheduleBriefWidget(parent,name, WStyle_Customize | WStyle_NoBorder) : kScheduleBriefWidget(parent,name, WStyle_Customize | WStyle_NoBorder)
{ {
KIconLoader *ic = KGlobal::iconLoader(); KIconLoader *ic = KGlobal::iconLoader();
m_nextButton->setPixmap(BarIcon(TQString::tqfromLatin1("1rightarrow"))); m_nextButton->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow")));
m_prevButton->setPixmap(BarIcon(TQString::tqfromLatin1("1leftarrow"))); m_prevButton->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow")));
connect(m_prevButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrevClicked())); connect(m_prevButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrevClicked()));
connect(m_nextButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNextClicked())); connect(m_nextButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNextClicked()));
@ -118,7 +118,7 @@ void KMyMoneyBriefSchedule::loadSchedule()
.tqarg(i18n(sched.occurenceToString())); .tqarg(i18n(sched.occurenceToString()));
} }
if (m_date < TQDate::tqcurrentDate()) if (m_date < TQDate::currentDate())
{ {
if (sched.isOverdue()) if (sched.isOverdue())
{ {
@ -129,8 +129,8 @@ void KMyMoneyBriefSchedule::loadSchedule()
if (m_date.isValid()) if (m_date.isValid())
startD = m_date; startD = m_date;
int days = startD.daysTo(TQDate::tqcurrentDate()); int days = startD.daysTo(TQDate::currentDate());
int transactions = sched.paymentDates(startD, TQDate::tqcurrentDate()).count(); int transactions = sched.paymentDates(startD, TQDate::currentDate()).count();
text += "<br><font color=red>"; text += "<br><font color=red>";
text += i18n("%1 days overdue (%2 occurences).") text += i18n("%1 days overdue (%2 occurences).")

2
kmymoney2/widgets/kmymoneycalculator.cpp
Unescape View File

@ -50,7 +50,7 @@ kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name)
display->setBackgroundColor(TQColor("#BDFFB4")); display->setBackgroundColor(TQColor("#BDFFB4"));
display->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); 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); grid->addMultiCellWidget(display, 0, 0, 0, 4);
buttons[0] = new KPushButton("0", this); buttons[0] = new KPushButton("0", this);

34
kmymoney2/widgets/kmymoneycalendar.cpp
Unescape View File

@ -138,10 +138,10 @@ void kMyMoneyCalendar::init( const TQDate &dt )
setFontSize(10); setFontSize(10);
line->setValidator(val); line->setValidator(val);
line->installEventFilter( this ); line->installEventFilter( this );
yearForward->setPixmap(BarIcon(TQString::tqfromLatin1("2rightarrow"))); yearForward->setPixmap(BarIcon(TQString::fromLatin1("2rightarrow")));
yearBackward->setPixmap(BarIcon(TQString::tqfromLatin1("2leftarrow"))); yearBackward->setPixmap(BarIcon(TQString::fromLatin1("2leftarrow")));
monthForward->setPixmap(BarIcon(TQString::tqfromLatin1("1rightarrow"))); monthForward->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow")));
monthBackward->setPixmap(BarIcon(TQString::tqfromLatin1("1leftarrow"))); monthBackward->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow")));
setDate(dt); // set button texts setDate(dt); // set button texts
connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate))); connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate)));
connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot()));
@ -200,7 +200,7 @@ kMyMoneyCalendar::resizeEvent(TQResizeEvent*)
// ----- calculate button row height: // ----- calculate button row height:
for(count=0; count<NoOfButtons; ++count) { for(count=0; count<NoOfButtons; ++count) {
if ( buttons[count] ) { // closeButton may be 0L if ( buttons[count] ) { // closeButton may be 0L
sizes[count]=buttons[count]->tqsizeHint(); sizes[count]=buttons[count]->sizeHint();
buttonHeight=TQMAX(buttonHeight, sizes[count].height()); buttonHeight=TQMAX(buttonHeight, sizes[count].height());
} }
else else
@ -211,7 +211,7 @@ kMyMoneyCalendar::resizeEvent(TQResizeEvent*)
for(count=0; count<NoOfButtons; ++count) { for(count=0; count<NoOfButtons; ++count) {
if(buttons[count]==selectMonth) { if(buttons[count]==selectMonth) {
TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); 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: // ----- place the buttons:
@ -245,7 +245,7 @@ kMyMoneyCalendar::resizeEvent(TQResizeEvent*)
} }
// ----- place the line edit for direct input: // ----- 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); 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()); 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()); d->selectWeek->setGeometry(width()-week_width, height()-sizes[0].height(), week_width, sizes[0].height());
@ -341,7 +341,7 @@ kMyMoneyCalendar::selectWeekClicked()
KPopupFrame* popup = new KPopupFrame(this); KPopupFrame* popup = new KPopupFrame(this);
KDateInternalWeekSelector* picker = new KDateInternalWeekSelector(/*fontsize, */popup); KDateInternalWeekSelector* picker = new KDateInternalWeekSelector(/*fontsize, */popup);
// ----- // -----
picker->resize(picker->tqsizeHint()); picker->resize(picker->sizeHint());
popup->setMainWidget(picker); popup->setMainWidget(picker);
connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int)));
picker->setFocus(); picker->setFocus();
@ -380,7 +380,7 @@ kMyMoneyCalendar::selectMonthClicked()
KPopupFrame* popup = new KPopupFrame(this); KPopupFrame* popup = new KPopupFrame(this);
KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(/*fontsize, */popup); KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(/*fontsize, */popup);
// ----- // -----
picker->resize(picker->tqsizeHint()); picker->resize(picker->sizeHint());
popup->setMainWidget(picker); popup->setMainWidget(picker);
picker->setFocus(); picker->setFocus();
connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int)));
@ -412,7 +412,7 @@ kMyMoneyCalendar::selectYearClicked()
KPopupFrame* popup = new KPopupFrame(this); KPopupFrame* popup = new KPopupFrame(this);
KDateInternalYearSelector* picker = new KDateInternalYearSelector(fontsize, popup); KDateInternalYearSelector* picker = new KDateInternalYearSelector(fontsize, popup);
// ----- // -----
picker->resize(picker->tqsizeHint()); picker->resize(picker->sizeHint());
popup->setMainWidget(picker); popup->setMainWidget(picker);
connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int)));
picker->setFocus(); picker->setFocus();
@ -470,9 +470,9 @@ kMyMoneyCalendar::lineEnterPressed()
} }
TQSize TQSize
kMyMoneyCalendar::tqsizeHint() const kMyMoneyCalendar::sizeHint() const
{ {
TQSize tableSize=table->tqsizeHint(); TQSize tableSize=table->sizeHint();
TQWidget *buttons[]={ TQWidget *buttons[]={
styleControl, styleControl,
yearBackward, yearBackward,
@ -492,14 +492,14 @@ kMyMoneyCalendar::tqsizeHint() const
for(count=0; count<NoOfButtons; ++count) for(count=0; count<NoOfButtons; ++count)
{ {
if ( buttons[count] ) if ( buttons[count] )
sizes[count]=buttons[count]->tqsizeHint(); sizes[count]=buttons[count]->sizeHint();
else else
sizes[count] = TQSize(0,0); sizes[count] = TQSize(0,0);
if(buttons[count]==selectMonth) if(buttons[count]==selectMonth)
{ {
TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); 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 { } else {
cx+=sizes[count].width(); cx+=sizes[count].width();
} }
@ -508,7 +508,7 @@ kMyMoneyCalendar::tqsizeHint() const
// ----- calculate width hint: // ----- calculate width hint:
cx=TQMAX(cx, tableSize.width()); // line edit ignored cx=TQMAX(cx, tableSize.width()); // line edit ignored
// ----- calculate height hint: // ----- calculate height hint:
cy+=tableSize.height()+line->tqsizeHint().height(); cy+=tableSize.height()+line->sizeHint().height();
return TQSize(cx, cy); return TQSize(cx, cy);
} }
@ -540,7 +540,7 @@ kMyMoneyCalendar::setFontSize(int s)
} }
TQFontMetrics metrics(selectMonth->fontMetrics()); TQFontMetrics metrics(selectMonth->fontMetrics());
for(int i=1; i <= 12; ++i) 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)); r=metrics.boundingRect(MONTH_NAME(i, 2000, false));
maxMonthRect.setWidth(TQMAX(r.width(), maxMonthRect.width())); maxMonthRect.setWidth(TQMAX(r.width(), maxMonthRect.width()));
maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height()));
@ -560,7 +560,7 @@ kMyMoneyCalendar::setCloseButton( bool enable )
TQToolTip::add(d->closeButton, i18n("Close")); TQToolTip::add(d->closeButton, i18n("Close"));
d->closeButton->setPixmap( SmallIcon("remove") ); d->closeButton->setPixmap( SmallIcon("remove") );
connect( d->closeButton, TQT_SIGNAL( clicked() ), connect( d->closeButton, TQT_SIGNAL( clicked() ),
tqtopLevelWidget(), TQT_SLOT( close() ) ); topLevelWidget(), TQT_SLOT( close() ) );
} }
else { else {
delete d->closeButton; delete d->closeButton;

4
kmymoney2/widgets/kmymoneycalendar.h
Unescape View File

@ -105,7 +105,7 @@ public:
* size hint, try adding 28 to each of the reported numbers of * size hint, try adding 28 to each of the reported numbers of
* pixels. * pixels.
**/ **/
TQSize tqsizeHint() const; TQSize sizeHint() const;
/** /**
* Sets the date. * Sets the date.
@ -144,7 +144,7 @@ public:
/** /**
* By calling this method with @p enable = true, KDatePicker will show * By calling this method with @p enable = true, KDatePicker will show
* a little close-button in the upper button-row. Clicking the * 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 * method being called. This is mostly useful for toplevel datepickers
* without a window manager decoration. * without a window manager decoration.
* @see #hasCloseButton * @see #hasCloseButton

14
kmymoney2/widgets/kmymoneycombo.cpp
Unescape View File

@ -131,12 +131,12 @@ void KMyMoneyCombo::paintEvent(TQPaintEvent* ev)
// is that length 1 is the blank case so no need to do painting // is that length 1 is the blank case so no need to do painting
if(str.length() > 1) { if(str.length() > 1) {
TQPainter p( this ); TQPainter p( this );
const TQColorGroup & g = tqcolorGroup(); const TQColorGroup & g = colorGroup();
p.setPen(g.text()); p.setPen(g.text());
TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxEditField ); TQStyle::SC_ComboBoxEditField );
re = TQStyle::tqvisualRect(re, this); re = TQStyle::visualRect(re, this);
p.setClipRect( re ); p.setClipRect( re );
p.save(); p.save();
p.setFont(font()); p.setFont(font());
@ -182,7 +182,7 @@ bool KMyMoneyCombo::isInArrowArea(const TQPoint& pos) const
{ {
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow); TQStyle::SC_ComboBoxArrow);
arrowRect = TQStyle::tqvisualRect(arrowRect, this); arrowRect = TQStyle::visualRect(arrowRect, this);
// Correction for motif style, where arrow is smaller // Correction for motif style, where arrow is smaller
// and thus has a rect that doesn't fit the button. // and thus has a rect that doesn't fit the button.
@ -305,9 +305,9 @@ void KMyMoneyCombo::setSelectedItem(const TQString& id)
update(); 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 // 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 // according to the largest item in the selector list. Apparently that
@ -325,11 +325,11 @@ TQSize KMyMoneyCombo::tqsizeHint() const
if ( w > maxW ) if ( w > maxW )
maxW = w; maxW = w;
TQSize tqsizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this, TQSize sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this,
TQSize(maxW, maxH)). TQSize(maxW, maxH)).
expandedTo(TQApplication::globalStrut())); expandedTo(TQApplication::globalStrut()));
return tqsizeHint; return sizeHint;
#endif #endif
} }

2
kmymoney2/widgets/kmymoneycombo.h
Unescape View File

@ -143,7 +143,7 @@ public:
/** /**
* Overridden to support our own completion box * Overridden to support our own completion box
*/ */
TQSize tqsizeHint() const; TQSize sizeHint() const;
protected slots: protected slots:
virtual void slotItemSelected(const TQString& id); virtual void slotItemSelected(const TQString& id);

2
kmymoney2/widgets/kmymoneycompletion.cpp
Unescape View File

@ -76,7 +76,7 @@ void kMyMoneyCompletion::adjustSize(void)
void kMyMoneyCompletion::adjustSize(const int count) 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()) if(m_parent && w < m_parent->width())
w = m_parent->width(); w = m_parent->width();

18
kmymoney2/widgets/kmymoneydateinput.cpp
Unescape View File

@ -73,11 +73,11 @@ kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *parent, const char *name, TQt::Al
: TQHBox(parent,name) : TQHBox(parent,name)
{ {
m_qttqalignment = flags; m_qttqalignment = flags;
m_date = TQDate::tqcurrentDate(); m_date = TQDate::currentDate();
dateEdit = new KMyMoneyDateEdit(m_date, this, "dateEdit"); dateEdit = new KMyMoneyDateEdit(m_date, this, "dateEdit");
setFocusProxy(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 dateEdit->installEventFilter(this); // To get dateEdit's FocusIn/Out and some KeyPress events
m_datePopup = new KPassivePopup(dateEdit, "datePopup"); m_datePopup = new KPassivePopup(dateEdit, "datePopup");
@ -165,13 +165,13 @@ void kMyMoneyDateInput::show(void)
void kMyMoneyDateInput::fixSize(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 // 28 pixels should be added in each direction to obtain a better
// display of the month button. I decided, (22,14) is good // display of the month button. I decided, (22,14) is good
// enough and save some space on the screen (ipwizard) // 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() kMyMoneyDateInput::~kMyMoneyDateInput()
@ -217,7 +217,7 @@ void kMyMoneyDateInput::toggleDatePicker()
} }
else else
{ {
m_datePicker->setDate(TQDate::tqcurrentDate()); m_datePicker->setDate(TQDate::currentDate());
} }
m_dateFrame->show(); m_dateFrame->show();
} }
@ -255,14 +255,14 @@ void kMyMoneyDateInput::keyPressEvent(TQKeyEvent * k)
default: default:
if(today.contains(KKey(k)) || k->key() == Key_T) { if(today.contains(KKey(k)) || k->key() == Key_T) {
slotDateChosen(TQDate::tqcurrentDate()); slotDateChosen(TQDate::currentDate());
} }
break; 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. * Some KeyPress events are intercepted and passed to keyPressEvent.
* Otherwise they would be consumed by TQDateEdit. * Otherwise they would be consumed by TQDateEdit.
*/ */
@ -337,7 +337,7 @@ void kMyMoneyDateInput::resetDate(void)
setDate(m_prevDate); setDate(m_prevDate);
} }
TQWidget* kMyMoneyDateInput::tqfocusWidget(void) const TQWidget* kMyMoneyDateInput::focusWidget(void) const
{ {
TQWidget* w = dateEdit; TQWidget* w = dateEdit;
while(w->focusProxy()) while(w->focusProxy())

4
kmymoney2/widgets/kmymoneydateinput.h
Unescape View File

@ -77,7 +77,7 @@ public:
void setDate(TQDate date); void setDate(TQDate date);
void loadDate(const TQDate& date); void loadDate(const TQDate& date);
void resetDate(void); void resetDate(void);
TQWidget* tqfocusWidget(void) const; TQWidget* focusWidget(void) const;
virtual void setRange(const TQDate & min, const TQDate & max) { dateEdit->setRange(min, max); } virtual void setRange(const TQDate & min, const TQDate & max) { dateEdit->setRange(min, max); }
void markAsBadDate(bool bad = false, const TQColor& = TQColor()); void markAsBadDate(bool bad = false, const TQColor& = TQColor());
@ -98,7 +98,7 @@ protected:
void keyPressEvent(TQKeyEvent * k); void keyPressEvent(TQKeyEvent * k);
void resizeEvent(TQResizeEvent*); void resizeEvent(TQResizeEvent*);
/** To intercept events sent to tqfocusWidget() */ /** To intercept events sent to focusWidget() */
bool eventFilter(TQObject *o, TQEvent *e); bool eventFilter(TQObject *o, TQEvent *e);
protected slots: protected slots:

10
kmymoney2/widgets/kmymoneydatetbl.cpp
Unescape View File

@ -80,7 +80,7 @@ kMyMoneyDateTbl::kMyMoneyDateTbl(TQWidget *parent, TQDate date_, const char* nam
if(!date_.isValid()) if(!date_.isValid())
{ {
kdDebug() << "kMyMoneyDateTbl ctor: WARNING: Given date is invalid, using current date." << endl; kdDebug() << "kMyMoneyDateTbl ctor: WARNING: Given date is invalid, using current date." << endl;
date_=TQDate::tqcurrentDate(); date_=TQDate::currentDate();
} }
setFocusPolicy( TQ_StrongFocus ); setFocusPolicy( TQ_StrongFocus );
@ -307,7 +307,7 @@ kMyMoneyDateTbl::keyPressEvent( TQKeyEvent *e )
return; return;
} }
if ( e->key() == TQt::Key_N ) { if ( e->key() == TQt::Key_N ) {
setDate(TQDate::tqcurrentDate()); setDate(TQDate::currentDate());
return; return;
} }
@ -352,7 +352,7 @@ kMyMoneyDateTbl::setFontSize(int size)
} }
// ----- compare with a real wide number and add some space: // ----- 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.setWidth(TQMAX(maxCell.width()+2, rect.width()));
maxCell.setHeight(TQMAX(maxCell.height()+4, rect.height())); maxCell.setHeight(TQMAX(maxCell.height()+4, rect.height()));
} }
@ -517,14 +517,14 @@ void kMyMoneyDateTbl::focusOutEvent( TQFocusEvent *e )
} }
TQSize TQSize
kMyMoneyDateTbl::tqsizeHint() const kMyMoneyDateTbl::sizeHint() const
{ {
if (maxCell.height()>0 && maxCell.width()>0) if (maxCell.height()>0 && maxCell.width()>0)
{ {
return TQSize(maxCell.width()*numCols()+2*frameWidth(), return TQSize(maxCell.width()*numCols()+2*frameWidth(),
(maxCell.height()+2)*numRows()+2*frameWidth()); (maxCell.height()+2)*numRows()+2*frameWidth());
} else { } else {
kdDebug() << "kMyMoneyDateTbl::tqsizeHint: obscure failure - " << endl; kdDebug() << "kMyMoneyDateTbl::sizeHint: obscure failure - " << endl;
return TQSize(-1, -1); return TQSize(-1, -1);
} }
} }

6
kmymoney2/widgets/kmymoneydatetbl.h
Unescape View File

@ -75,16 +75,16 @@ public:
* The constructor. * The constructor.
*/ */
kMyMoneyDateTbl(TQWidget *parent=0, kMyMoneyDateTbl(TQWidget *parent=0,
TQDate date=TQDate::tqcurrentDate(), TQDate date=TQDate::currentDate(),
const char* name=0, WFlags f=0); const char* name=0, WFlags f=0);
/** /**
* Returns a recommended size for the widget. * Returns a recommended size for the widget.
* To save some time, the size of the largest used cell content is * To save some time, the size of the largest used cell content is
* calculated in each paintCell() call, since all calculations have * calculated in each paintCell() call, since all calculations have
* to be done there anyway. The size is stored in maxCell. The * 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. * Set the font size of the date table.
*/ */

12
kmymoney2/widgets/kmymoneyedit.cpp
Unescape View File

@ -211,7 +211,7 @@ void kMyMoneyEdit::init(void)
// Yes, just a simple double validator ! // Yes, just a simple double validator !
kMyMoneyMoneyValidator *validator = new kMyMoneyMoneyValidator(TQT_TQOBJECT(this)); kMyMoneyMoneyValidator *validator = new kMyMoneyMoneyValidator(TQT_TQOBJECT(this));
m_edit->setValidator(validator); m_edit->setValidator(validator);
m_edit->tqsetAlignment(AlignRight | AlignVCenter); m_edit->setAlignment(AlignRight | AlignVCenter);
m_calculatorFrame = new TQVBox(this, 0, WType_Popup); m_calculatorFrame = new TQVBox(this, 0, WType_Popup);
@ -223,15 +223,15 @@ void kMyMoneyEdit::init(void)
m_calculatorFrame->hide(); m_calculatorFrame->hide();
m_calcButton = new KPushButton(TQIconSet(TQPixmap(KGlobal::iconLoader()->iconPath("kcalc", -KIcon::SizeSmall))), TQString(""), this); m_calcButton = new KPushButton(TQIconSet(TQPixmap(KGlobal::iconLoader()->iconPath("kcalc", -KIcon::SizeSmall))), TQString(""), this);
m_calcButton->setFixedWidth( m_calcButton->tqsizeHint().width() ); m_calcButton->setFixedWidth( m_calcButton->sizeHint().width() );
m_calcButton->setFixedHeight(m_edit->tqsizeHint().height()); m_calcButton->setFixedHeight(m_edit->sizeHint().height());
m_calcButton->setFocusProxy(m_edit); m_calcButton->setFocusProxy(m_edit);
TQPixmap pixmap; TQPixmap pixmap;
pixmap.loadFromData(resetButtonImage, sizeof(resetButtonImage), "PNG", 0); pixmap.loadFromData(resetButtonImage, sizeof(resetButtonImage), "PNG", 0);
m_resetButton = new KPushButton(TQIconSet(pixmap), TQString(""), this); m_resetButton = new KPushButton(TQIconSet(pixmap), TQString(""), this);
m_resetButton->setFixedWidth( m_resetButton->tqsizeHint().width() ); m_resetButton->setFixedWidth( m_resetButton->sizeHint().width() );
m_resetButton->setFixedHeight(m_edit->tqsizeHint().height()); m_resetButton->setFixedHeight(m_edit->sizeHint().height());
m_resetButton->setEnabled(false); m_resetButton->setEnabled(false);
m_resetButton->setFocusProxy(m_edit); m_resetButton->setFocusProxy(m_edit);
@ -496,7 +496,7 @@ void kMyMoneyEdit::slotCalculatorResult(void)
} }
} }
TQWidget* kMyMoneyEdit::tqfocusWidget(void) const TQWidget* kMyMoneyEdit::focusWidget(void) const
{ {
TQWidget* w = m_edit; TQWidget* w = m_edit;
while(w->focusProxy()) while(w->focusProxy())

2
kmymoney2/widgets/kmymoneyedit.h
Unescape View File

@ -184,7 +184,7 @@ public:
*/ */
int precision(void) { return m_prec; }; int precision(void) { return m_prec; };
TQWidget* tqfocusWidget(void) const; TQWidget* focusWidget(void) const;
/** /**
* This method allows to modify the behavior of the widget * This method allows to modify the behavior of the widget

4
kmymoney2/widgets/kmymoneygpgconfigdecl.ui
Unescape View File

@ -133,7 +133,7 @@ The &lt;i&gt;Recovery encryption&lt;/i&gt; group is only accessible, if the nece
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>51</width> <width>51</width>
<height>20</height> <height>20</height>
@ -184,7 +184,7 @@ This mechanism is provided for the case that you have lost your key and cannot a
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>16</height> <height>16</height>

2
kmymoney2/widgets/kmymoneylineedit.cpp
Unescape View File

@ -39,7 +39,7 @@ kMyMoneyLineEdit::kMyMoneyLineEdit(TQWidget *w, const char* name, bool forceMone
KLineEdit(w, name), KLineEdit(w, name),
m_forceMonetaryDecimalSymbol(forceMonetaryDecimalSymbol) m_forceMonetaryDecimalSymbol(forceMonetaryDecimalSymbol)
{ {
tqsetAlignment(tqalignment); setAlignment(tqalignment);
} }
kMyMoneyLineEdit::~kMyMoneyLineEdit() kMyMoneyLineEdit::~kMyMoneyLineEdit()

4
kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui
Unescape View File

@ -12,7 +12,7 @@
<height>487</height> <height>487</height>
</rect> </rect>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -206,7 +206,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>240</width> <width>240</width>
<height>20</height> <height>20</height>

2
kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui
Unescape View File

@ -110,7 +110,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui
Unescape View File

@ -226,7 +226,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>94</width> <width>94</width>
<height>21</height> <height>21</height>
@ -269,7 +269,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>

14
kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui
Unescape View File

@ -125,7 +125,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>358</width> <width>358</width>
<height>16</height> <height>16</height>
@ -174,7 +174,7 @@
<property name="name"> <property name="name">
<cstring>m_checkMemo</cstring> <cstring>m_checkMemo</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -235,7 +235,7 @@
<property name="name"> <property name="name">
<cstring>m_checkNumber</cstring> <cstring>m_checkNumber</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -252,7 +252,7 @@
<property name="name"> <property name="name">
<cstring>m_checkPayee</cstring> <cstring>m_checkPayee</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -269,7 +269,7 @@
<property name="name"> <property name="name">
<cstring>m_checkCategory</cstring> <cstring>m_checkCategory</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -316,7 +316,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>205</width> <width>205</width>
<height>20</height> <height>20</height>
@ -386,7 +386,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

6
kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui
Unescape View File

@ -92,7 +92,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>121</width> <width>121</width>
<height>20</height> <height>20</height>
@ -182,7 +182,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>121</width> <width>121</width>
<height>20</height> <height>20</height>
@ -201,7 +201,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

14
kmymoney2/widgets/kmymoneyreportcontroldecl.ui
Unescape View File

@ -29,7 +29,7 @@
<property name="name"> <property name="name">
<cstring>buttonChart</cstring> <cstring>buttonChart</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>75</width> <width>75</width>
<height>0</height> <height>0</height>
@ -46,7 +46,7 @@
<property name="name"> <property name="name">
<cstring>buttonConfigure</cstring> <cstring>buttonConfigure</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>75</width> <width>75</width>
<height>0</height> <height>0</height>
@ -63,7 +63,7 @@
<property name="name"> <property name="name">
<cstring>buttonNew</cstring> <cstring>buttonNew</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>75</width> <width>75</width>
<height>0</height> <height>0</height>
@ -80,7 +80,7 @@
<property name="name"> <property name="name">
<cstring>buttonCopy</cstring> <cstring>buttonCopy</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>75</width> <width>75</width>
<height>0</height> <height>0</height>
@ -97,7 +97,7 @@
<property name="name"> <property name="name">
<cstring>buttonExport</cstring> <cstring>buttonExport</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>75</width> <width>75</width>
<height>0</height> <height>0</height>
@ -114,7 +114,7 @@
<property name="name"> <property name="name">
<cstring>buttonDelete</cstring> <cstring>buttonDelete</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>75</width> <width>75</width>
<height>0</height> <height>0</height>
@ -131,7 +131,7 @@
<property name="name"> <property name="name">
<cstring>buttonClose</cstring> <cstring>buttonClose</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>75</width> <width>75</width>
<height>0</height> <height>0</height>

2
kmymoney2/widgets/kmymoneyscheduledcalendar.cpp
Unescape View File

@ -59,7 +59,7 @@ kMyMoneyScheduledCalendar::kMyMoneyScheduledCalendar(TQWidget *parent, const cha
setUserButton1(true, pb1); setUserButton1(true, pb1);
init( TQDate::tqcurrentDate() ); init( TQDate::currentDate() );
connect(m_scheduledDateTable, TQT_SIGNAL(enterClicked(const MyMoneySchedule&, const TQDate&)), connect(m_scheduledDateTable, TQT_SIGNAL(enterClicked(const MyMoneySchedule&, const TQDate&)),
this, TQT_SIGNAL(enterClicked(const MyMoneySchedule&, const TQDate&))); this, TQT_SIGNAL(enterClicked(const MyMoneySchedule&, const TQDate&)));

8
kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
Unescape View File

@ -176,7 +176,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/,
for (iter=schedules.begin(); iter!=schedules.end(); ++iter) for (iter=schedules.begin(); iter!=schedules.end(); ++iter)
{ {
MyMoneySchedule schedule = *iter; MyMoneySchedule schedule = *iter;
if (theDate < TQDate::tqcurrentDate()) if (theDate < TQDate::currentDate())
{ {
if (schedule.isOverdue()) if (schedule.isOverdue())
{ {
@ -286,7 +286,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/,
for (iter=transferSchedules.begin(); iter!=transferSchedules.end(); ++iter) for (iter=transferSchedules.begin(); iter!=transferSchedules.end(); ++iter)
{ {
MyMoneySchedule schedule = *iter; MyMoneySchedule schedule = *iter;
if (theDate < TQDate::tqcurrentDate()) if (theDate < TQDate::currentDate())
{ {
if (schedule.isOverdue()) if (schedule.isOverdue())
{ {
@ -301,7 +301,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/,
for (iter=depositSchedules.begin(); iter!=depositSchedules.end(); ++iter) for (iter=depositSchedules.begin(); iter!=depositSchedules.end(); ++iter)
{ {
MyMoneySchedule schedule = *iter; MyMoneySchedule schedule = *iter;
if (theDate < TQDate::tqcurrentDate()) if (theDate < TQDate::currentDate())
{ {
if (schedule.isOverdue()) if (schedule.isOverdue())
{ {
@ -316,7 +316,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/,
for (iter=billSchedules.begin(); iter!=billSchedules.end(); ++iter) for (iter=billSchedules.begin(); iter!=billSchedules.end(); ++iter)
{ {
MyMoneySchedule schedule = *iter; MyMoneySchedule schedule = *iter;
if (theDate < TQDate::tqcurrentDate()) if (theDate < TQDate::currentDate())
{ {
if (schedule.isOverdue()) if (schedule.isOverdue())
{ {

2
kmymoney2/widgets/kmymoneyscheduleddatetbl.h
Unescape View File

@ -46,7 +46,7 @@ class kMyMoneyScheduledDateTbl : public kMyMoneyDateTbl
TQ_OBJECT TQ_OBJECT
public: public:
kMyMoneyScheduledDateTbl(TQWidget *parent=0, kMyMoneyScheduledDateTbl(TQWidget *parent=0,
TQDate date=TQDate::tqcurrentDate(), TQDate date=TQDate::currentDate(),
const char* name=0, WFlags f=0); const char* name=0, WFlags f=0);
~kMyMoneyScheduledDateTbl(); ~kMyMoneyScheduledDateTbl();

4
kmymoney2/widgets/kmymoneyselector.cpp
Unescape View File

@ -661,7 +661,7 @@ void KMyMoneySelector::slotListRightMouse(TQListViewItem* it_v, const TQPoint& p
KMyMoneyCheckListItem* it_c = static_cast<KMyMoneyCheckListItem*>(it_v); KMyMoneyCheckListItem* it_c = static_cast<KMyMoneyCheckListItem*>(it_v);
if(it_c->type() == TQCheckListItem::CheckBox) { if(it_c->type() == TQCheckListItem::CheckBox) {
// the following is copied from TQCheckListItem::activate() et al // 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 align = m_listView->columnAlignment( 0 );
int marg = m_listView->itemMargin(); int marg = m_listView->itemMargin();
int y = 0; int y = 0;
@ -675,7 +675,7 @@ void KMyMoneySelector::slotListRightMouse(TQListViewItem* it_v, const TQPoint& p
// columns might have been swapped // columns might have been swapped
r.moveBy( m_listView->header()->sectionPos( 0 ), 0 ); 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; TQPoint p = m_listView->mapFromGlobal( pos ) - topLeft;
int xdepth = m_listView->treeStepSize() * (it_v->depth() + (m_listView->rootIsDecorated() ? 1 : 0)) int xdepth = m_listView->treeStepSize() * (it_v->depth() + (m_listView->rootIsDecorated() ? 1 : 0))

2
kmymoney2/widgets/kmymoneytitlelabel.cpp
Unescape View File

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

6
kmymoney2/widgets/kmymoneywizard.cpp
Unescape View File

@ -155,7 +155,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W
m_stepLayout->addWidget(new TQLabel("", m_stepFrame)); m_stepLayout->addWidget(new TQLabel("", m_stepFrame));
m_stepLayout->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); m_stepLayout->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
m_stepLabel = new TQLabel(m_stepFrame, "stepLabel"); m_stepLabel = new TQLabel(m_stepFrame, "stepLabel");
m_stepLabel->tqsetAlignment(TQt::AlignHCenter); m_stepLabel->setAlignment(TQt::AlignHCenter);
m_stepLayout->addWidget(m_stepLabel); m_stepLayout->addWidget(m_stepLabel);
hboxLayout->addWidget(m_stepFrame); hboxLayout->addWidget(m_stepFrame);
@ -183,7 +183,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W
hboxLayout->addLayout(m_pageLayout); hboxLayout->addLayout(m_pageLayout);
m_wizardLayout->addLayout(hboxLayout); m_wizardLayout->addLayout(hboxLayout);
resize(TQSize(770, 520).expandedTo(tqminimumSizeHint())); resize(TQSize(770, 520).expandedTo(minimumSizeHint()));
clearWState(WState_Polished); clearWState(WState_Polished);
m_titleLabel->setText("No Title specified"); m_titleLabel->setText("No Title specified");
@ -207,7 +207,7 @@ void KMyMoneyWizard::addStep(const TQString& text)
{ {
TQLabel* step = new TQLabel(text, m_stepFrame); TQLabel* step = new TQLabel(text, m_stepFrame);
step->setFrameStyle(TQFrame::Panel | TQFrame::Raised); step->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
step->tqsetAlignment(TQt::AlignHCenter); step->setAlignment(TQt::AlignHCenter);
step->setFrameStyle(TQFrame::Box | TQFrame::Sunken); step->setFrameStyle(TQFrame::Box | TQFrame::Sunken);
step->setMargin(2); step->setMargin(2);
step->setPalette( m_stepPalette ); step->setPalette( m_stepPalette );

18
kmymoney2/widgets/kschedulebriefwidget.ui
Unescape View File

@ -86,7 +86,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>0</height> <height>0</height>
@ -111,7 +111,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>70</width> <width>70</width>
<height>0</height> <height>0</height>
@ -140,13 +140,13 @@
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>60</width> <width>60</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>60</width> <width>60</width>
<height>32767</height> <height>32767</height>
@ -160,13 +160,13 @@
<property name="name"> <property name="name">
<cstring>textLabel2</cstring> <cstring>textLabel2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>60</width> <width>60</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>60</width> <width>60</width>
<height>32767</height> <height>32767</height>
@ -221,7 +221,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>60</width> <width>60</width>
<height>0</height> <height>0</height>
@ -274,7 +274,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>35</width> <width>35</width>
<height>0</height> <height>0</height>
@ -334,7 +334,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>43</width> <width>43</width>
<height>0</height> <height>0</height>

10
kmymoney2/widgets/register.cpp
Unescape View File

@ -1292,9 +1292,9 @@ void Register::resize(int col)
kMyMoneyEdit* valField = new kMyMoneyEdit; kMyMoneyEdit* valField = new kMyMoneyEdit;
dateField->setFont(KMyMoneyGlobalSettings::listCellFont()); dateField->setFont(KMyMoneyGlobalSettings::listCellFont());
setColumnWidth(DateColumn, dateField->tqminimumSizeHint().width()); setColumnWidth(DateColumn, dateField->minimumSizeHint().width());
valField->setMinimumWidth(ewidth); valField->setMinimumWidth(ewidth);
ewidth = valField->tqminimumSizeHint().width(); ewidth = valField->minimumSizeHint().width();
if(swidth > 0) { if(swidth > 0) {
swidth = columnWidth(SecurityColumn) + 40; swidth = columnWidth(SecurityColumn) + 40;
@ -2265,7 +2265,7 @@ void Register::addGroupMarkers(void)
switch(primarySortKey()) { switch(primarySortKey()) {
case KMyMoneyRegister::PostDateSort: case KMyMoneyRegister::PostDateSort:
case KMyMoneyRegister::EntryDateSort: case KMyMoneyRegister::EntryDateSort:
today = TQDate::tqcurrentDate(); today = TQDate::currentDate();
thisMonth.setYMD(today.year(), today.month(), 1); thisMonth.setYMD(today.year(), today.month(), 1);
lastMonth = thisMonth.addMonths(-1); lastMonth = thisMonth.addMonths(-1);
yesterday = today.addDays(-1); yesterday = today.addDays(-1);
@ -2309,9 +2309,9 @@ void Register::addGroupMarkers(void)
new KMyMoneyRegister::SimpleDateGroupMarker(this, today.addDays(1), i18n("Future transactions")); new KMyMoneyRegister::SimpleDateGroupMarker(this, today.addDays(1), i18n("Future transactions"));
} }
if(KMyMoneyGlobalSettings::showFiscalMarker()) { 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); currentFiscalYear = currentFiscalYear.addYears(-1);
TQDate previousFiscalYear = currentFiscalYear.addYears(-1); TQDate previousFiscalYear = currentFiscalYear.addYears(-1);
new KMyMoneyRegister::FiscalYearGroupMarker(this, currentFiscalYear, i18n("Current fiscal year")); new KMyMoneyRegister::FiscalYearGroupMarker(this, currentFiscalYear, i18n("Current fiscal year"));

88
kmymoney2/widgets/transaction.cpp
Unescape View File

@ -508,7 +508,7 @@ int Transaction::formRowHeight(void) const
kMyMoneyDateInput dateInput; kMyMoneyDateInput dateInput;
KMyMoneyCategory category(0,0,true); KMyMoneyCategory category(0,0,true);
return TQMAX(dateInput.tqsizeHint().height(), category.tqsizeHint().height()); return TQMAX(dateInput.sizeHint().height(), category.sizeHint().height());
} }
return m_formRowHeight; return m_formRowHeight;
} }
@ -598,7 +598,7 @@ void Transaction::setupRegisterPalette(TQMap<TQString, TQWidget*>& editWidgets)
setupPalette(palette, editWidgets); setupPalette(palette, editWidgets);
} }
TQWidget* Transaction::tqfocusWidget(TQWidget* w) const TQWidget* Transaction::focusWidget(TQWidget* w) const
{ {
if(w) { if(w) {
while(w->focusProxy()) while(w->focusProxy())
@ -1253,34 +1253,34 @@ void StdTransaction::tabOrderInForm(TQWidgetList& tabOrderWidgets) const
TQWidget* w; TQWidget* w;
while(it_s != taborder.constEnd()) { while(it_s != taborder.constEnd()) {
if(*it_s == "account") { 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") { } 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") { } 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") { } else if(*it_s == "category") {
// make sure to have the category field and the split button as seperate tab order widgets // 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 // 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 // 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 ... // go haywire when someone changes the KMyMoneyCategory object ...
w = m_form->cellWidget(2, ValueColumn1); w = m_form->cellWidget(2, ValueColumn1);
tabOrderWidgets.append(tqfocusWidget(w)); tabOrderWidgets.append(focusWidget(w));
w = dynamic_cast<TQWidget*>(w->child("splitButton")); w = dynamic_cast<TQWidget*>(w->child("splitButton"));
if(w) if(w)
tabOrderWidgets.append(w); tabOrderWidgets.append(w);
} else if(*it_s == "memo") { } 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") { } else if(*it_s == "number") {
if(haveNumberField()) { if(haveNumberField()) {
if((w = tqfocusWidget(m_form->cellWidget(1, ValueColumn2)))) if((w = focusWidget(m_form->cellWidget(1, ValueColumn2))))
tabOrderWidgets.append(w); tabOrderWidgets.append(w);
} }
} else if(*it_s == "date") { } 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") { } 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") { } else if(*it_s == "state") {
tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(5, ValueColumn2))); tabOrderWidgets.append(focusWidget(m_form->cellWidget(5, ValueColumn2)));
} }
++it_s; ++it_s;
} }
@ -1315,31 +1315,31 @@ void StdTransaction::tabOrderInRegister(TQWidgetList& tabOrderWidgets) const
while(it_s != taborder.constEnd()) { while(it_s != taborder.constEnd()) {
if(*it_s == "number") { if(*it_s == "number") {
if(haveNumberField()) { 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); tabOrderWidgets.append(w);
} }
} else if(*it_s == "date") { } 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") { } 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") { } else if(*it_s == "category") {
// make sure to have the category field and the split button as seperate tab order widgets // 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 // 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 // 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 ... // go haywire when someone changes the KMyMoneyCategory object ...
w = m_parent->cellWidget(m_startRow + 1, DetailColumn); w = m_parent->cellWidget(m_startRow + 1, DetailColumn);
tabOrderWidgets.append(tqfocusWidget(w)); tabOrderWidgets.append(focusWidget(w));
w = dynamic_cast<TQWidget*>(w->child("splitButton")); w = dynamic_cast<TQWidget*>(w->child("splitButton"));
if(w) if(w)
tabOrderWidgets.append(w); tabOrderWidgets.append(w);
} else if(*it_s == "memo") { } 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") { } 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") { } 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") { } 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; ++it_s;
} }
@ -1929,54 +1929,54 @@ void InvestTransaction::arrangeWidgetsInForm(TQMap<TQString, TQWidget*>& editWid
void InvestTransaction::tabOrderInForm(TQWidgetList& tabOrderWidgets) const void InvestTransaction::tabOrderInForm(TQWidgetList& tabOrderWidgets) const
{ {
// activity // activity
tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(0, ValueColumn1))); tabOrderWidgets.append(focusWidget(m_form->cellWidget(0, ValueColumn1)));
// date // date
tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(0, ValueColumn2))); tabOrderWidgets.append(focusWidget(m_form->cellWidget(0, ValueColumn2)));
// security // security
tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(1, ValueColumn1))); tabOrderWidgets.append(focusWidget(m_form->cellWidget(1, ValueColumn1)));
// shares // shares
tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(1, ValueColumn2))); tabOrderWidgets.append(focusWidget(m_form->cellWidget(1, ValueColumn2)));
// account // account
tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(2, ValueColumn1))); tabOrderWidgets.append(focusWidget(m_form->cellWidget(2, ValueColumn1)));
// price // 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 // 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 // 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 // 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 ... // go haywire when someone changes the KMyMoneyCategory object ...
TQWidget* w = m_form->cellWidget(3, ValueColumn1); TQWidget* w = m_form->cellWidget(3, ValueColumn1);
tabOrderWidgets.append(tqfocusWidget(w)); tabOrderWidgets.append(focusWidget(w));
w = dynamic_cast<TQWidget*>(w->child("splitButton")); w = dynamic_cast<TQWidget*>(w->child("splitButton"));
if(w) if(w)
tabOrderWidgets.append(w); tabOrderWidgets.append(w);
// fee amount // 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 // the same applies for the interest categories
w = m_form->cellWidget(4, ValueColumn1); w = m_form->cellWidget(4, ValueColumn1);
tabOrderWidgets.append(tqfocusWidget(w)); tabOrderWidgets.append(focusWidget(w));
w = dynamic_cast<TQWidget*>(w->child("splitButton")); w = dynamic_cast<TQWidget*>(w->child("splitButton"));
if(w) if(w)
tabOrderWidgets.append(w); tabOrderWidgets.append(w);
// interest amount // interest amount
tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(4, ValueColumn2))); tabOrderWidgets.append(focusWidget(m_form->cellWidget(4, ValueColumn2)));
// memo // memo
tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(5, ValueColumn1))); tabOrderWidgets.append(focusWidget(m_form->cellWidget(5, ValueColumn1)));
// total // total
tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(5, ValueColumn2))); tabOrderWidgets.append(focusWidget(m_form->cellWidget(5, ValueColumn2)));
// state // state
tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(6, ValueColumn2))); tabOrderWidgets.append(focusWidget(m_form->cellWidget(6, ValueColumn2)));
} }
void InvestTransaction::arrangeWidgetsInRegister(TQMap<TQString, TQWidget*>& editWidgets) void InvestTransaction::arrangeWidgetsInRegister(TQMap<TQString, TQWidget*>& editWidgets)
@ -2009,45 +2009,45 @@ void InvestTransaction::tabOrderInRegister(TQWidgetList& tabOrderWidgets) const
TQWidget* w; TQWidget* w;
// date // date
tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, DateColumn))); tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, DateColumn)));
// security // security
tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, SecurityColumn))); tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, SecurityColumn)));
// activity // activity
tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, DetailColumn))); tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, DetailColumn)));
// shares // shares
tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, QuantityColumn))); tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, QuantityColumn)));
// price // price
tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, PriceColumn))); tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, PriceColumn)));
// asset account // 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 // 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 // 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 // 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 ... // go haywire when someone changes the KMyMoneyCategory object ...
w = m_parent->cellWidget(m_startRow + 2, DetailColumn); // interest account 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")); w = dynamic_cast<TQWidget*>(w->child("splitButton"));
if(w) if(w)
tabOrderWidgets.append(w); tabOrderWidgets.append(w);
// interest amount // 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 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")); w = dynamic_cast<TQWidget*>(w->child("splitButton"));
if(w) if(w)
tabOrderWidgets.append(w); tabOrderWidgets.append(w);
// fee amount // fee amount
tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 3, QuantityColumn))); tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 3, QuantityColumn)));
// memo // memo
tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 4, DetailColumn))); tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 4, DetailColumn)));
// status // 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 int InvestTransaction::numRowsRegister(bool expanded) const

2
kmymoney2/widgets/transaction.h
Unescape View File

@ -183,7 +183,7 @@ public:
virtual KMyMoneyRegister::Action actionType(void) const = 0; 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; void arrangeWidget(TQTable* tbl, int row, int col, TQWidget* w) const;
bool haveNumberField(void) const; bool haveNumberField(void) const;

14
kmymoney2/widgets/transactionform.cpp
Unescape View File

@ -237,8 +237,8 @@ void TransactionForm::slotSetTransaction(KMyMoneyRegister::Transaction* transact
kMyMoneyDateInput dateInput(0, "editDate"); kMyMoneyDateInput dateInput(0, "editDate");
KMyMoneyCategory category(0, "category", true); KMyMoneyCategory category(0, "category", true);
// extract the maximal tqsizeHint height // extract the maximal sizeHint height
int height = TQMAX(dateInput.tqsizeHint().height(), category.tqsizeHint().height()); int height = TQMAX(dateInput.sizeHint().height(), category.sizeHint().height());
for(int row = 0; row < numRows(); ++row) { for(int row = 0; row < numRows(); ++row) {
if(!transaction || transaction->showRowInForm(row)) { if(!transaction || transaction->showRowInForm(row)) {
@ -273,7 +273,7 @@ TabBar* TransactionForm::tabBar(TQWidget* parent)
// create the tab bar // create the tab bar
m_tabBar = new TabBar( parent ); m_tabBar = new TabBar( parent );
m_tabBar->setSignalEmission(TabBar::SignalAlways); 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))); connect(m_tabBar, TQT_SIGNAL(tabSelected(int)), this, TQT_SLOT(slotActionSelected(int)));
} }
return m_tabBar; return m_tabBar;
@ -387,9 +387,9 @@ TQSize TransactionForm::tableSize(void) const
rowPos(numRows()-1) + rowHeight(numRows()-1) + 10); 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(); int vmargin = TQApplication::reverseLayout() ? rightMargin() : leftMargin();
return TQSize(tableSize().width() + vmargin + 5, tableSize().height() + topMargin() + 10); return TQSize(tableSize().width() + vmargin + 5, tableSize().height() + topMargin() + 10);
} }
@ -403,7 +403,7 @@ void TransactionForm::adjustColumn(Column col)
if(col == ValueColumn2) { if(col == ValueColumn2) {
kMyMoneyDateInput dateInput; kMyMoneyDateInput dateInput;
kMyMoneyEdit valInput; kMyMoneyEdit valInput;
w = TQMAX(dateInput.tqsizeHint().width(), valInput.tqsizeHint().width()); w = TQMAX(dateInput.sizeHint().width(), valInput.sizeHint().width());
} }
if(m_transaction) { if(m_transaction) {
@ -416,7 +416,7 @@ void TransactionForm::adjustColumn(Column col)
m_transaction->formCellText(txt, align, i, static_cast<int>(col), 0); m_transaction->formCellText(txt, align, i, static_cast<int>(col), 0);
TQWidget* cw = cellWidget(i, col); TQWidget* cw = cellWidget(i, col);
if(cw) { if(cw) {
w = TQMAX(w, cw->tqsizeHint().width()+10); w = TQMAX(w, cw->sizeHint().width()+10);
} }
w = TQMAX(w, fontMetrics.width(txt)+10); w = TQMAX(w, fontMetrics.width(txt)+10);
} }

2
kmymoney2/widgets/transactionform.h
Unescape View File

@ -135,7 +135,7 @@ public:
void paintFocus(TQPainter* /*p*/, const TQRect& /*cr*/ ) {} void paintFocus(TQPainter* /*p*/, const TQRect& /*cr*/ ) {}
TQSize tableSize(void) const; TQSize tableSize(void) const;
TQSize tqsizeHint(void) const; TQSize sizeHint(void) const;
void adjustColumn(Column col); void adjustColumn(Column col);
void clear(void); void clear(void);

8
kmymoney2/widgets/transactionsortoption.ui
Unescape View File

@ -73,7 +73,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>67</height> <height>67</height>
@ -106,7 +106,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>67</height> <height>67</height>
@ -168,7 +168,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>67</height> <height>67</height>
@ -201,7 +201,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>67</height> <height>67</height>

8
kmymoney2/wizards/newaccountwizard/kaccounttypepagedecl.ui
Unescape View File

@ -73,7 +73,7 @@ Enter the date the account was opened and its currency.</string>
<property name="name"> <property name="name">
<cstring>m_openingBalance</cstring> <cstring>m_openingBalance</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>0</height> <height>0</height>
@ -216,7 +216,7 @@ Use the liability account type to manage any type of liability except amortizati
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>231</width> <width>231</width>
<height>20</height> <height>20</height>
@ -257,7 +257,7 @@ Use the liability account type to manage any type of liability except amortizati
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>21</height> <height>21</height>
@ -276,7 +276,7 @@ Use the liability account type to manage any type of liability except amortizati
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

4
kmymoney2/wizards/newaccountwizard/kbrokeragepagedecl.ui
Unescape View File

@ -126,7 +126,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>20</height> <height>20</height>
@ -145,7 +145,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>30</height> <height>30</height>

4
kmymoney2/wizards/newaccountwizard/kgeneralloaninfopagedecl.ui
Unescape View File

@ -324,7 +324,7 @@ Enter the due date of the first payment in the current year</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>29</width> <width>29</width>
<height>20</height> <height>20</height>
@ -343,7 +343,7 @@ Enter the due date of the first payment in the current year</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

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

@ -67,7 +67,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>

4
kmymoney2/wizards/newaccountwizard/kinstitutionpagedecl.ui
Unescape View File

@ -124,7 +124,7 @@ KMyMoney keeps this field only for documentation purposes and does not use it ot
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>132</width> <width>132</width>
<height>20</height> <height>20</height>
@ -143,7 +143,7 @@ KMyMoney keeps this field only for documentation purposes and does not use it ot
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>

10
kmymoney2/wizards/newaccountwizard/kloandetailspagedecl.ui
Unescape View File

@ -37,7 +37,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>70</height> <height>70</height>
@ -202,7 +202,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>71</width> <width>71</width>
<height>20</height> <height>20</height>
@ -235,7 +235,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -254,7 +254,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>27</width> <width>27</width>
<height>21</height> <height>21</height>
@ -273,7 +273,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

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

@ -45,7 +45,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>63</width> <width>63</width>
<height>21</height> <height>21</height>
@ -152,7 +152,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>62</width> <width>62</width>
<height>21</height> <height>21</height>
@ -171,7 +171,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
kmymoney2/wizards/newaccountwizard/kloanpayoutpagedecl.ui
Unescape View File

@ -135,7 +135,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

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

@ -102,7 +102,7 @@ If you selected to record all payments this date has already been supplied. If y
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>20</height> <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"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>20</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>

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

@ -790,7 +790,7 @@ void GeneralLoanInfoPage::enterPage(void)
{ {
if(m_firstTime) { if(m_firstTime) {
// setup default dates to last of this month and one year on top // 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_firstPaymentDate->setDate(firstDay.addMonths(1).addDays(-1));
m_interestChangeDateEdit->setDate(m_firstPaymentDate->date().addYears(1));; m_interestChangeDateEdit->setDate(m_firstPaymentDate->date().addYears(1));;
m_firstTime = false; m_firstTime = false;

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

@ -64,7 +64,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>180</width> <width>180</width>
<height>0</height> <height>0</height>
@ -166,7 +166,7 @@ from account</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>31</height> <height>31</height>

6
kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui
Unescape View File

@ -134,7 +134,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>81</width> <width>81</width>
<height>20</height> <height>20</height>
@ -204,7 +204,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>200</width> <width>200</width>
<height>20</height> <height>20</height>
@ -236,7 +236,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

4
kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui
Unescape View File

@ -45,7 +45,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>21</height> <height>21</height>
@ -67,7 +67,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>51</width> <width>51</width>
<height>21</height> <height>21</height>

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

@ -42,7 +42,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>

18
kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui
Unescape View File

@ -38,7 +38,7 @@ This information will be seen and used only by you. The information is used to p
<property name="name"> <property name="name">
<cstring>frame8</cstring> <cstring>frame8</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>25</width> <width>25</width>
<height>0</height> <height>0</height>
@ -71,7 +71,7 @@ This information will be seen and used only by you. The information is used to p
<property name="name"> <property name="name">
<cstring>TextLabel4</cstring> <cstring>TextLabel4</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <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"> <property name="name">
<cstring>TextLabel2</cstring> <cstring>TextLabel2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <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"> <property name="name">
<cstring>TextLabel7</cstring> <cstring>TextLabel7</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <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"> <property name="name">
<cstring>TextLabel6</cstring> <cstring>TextLabel6</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <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"> <property name="name">
<cstring>TextLabel3</cstring> <cstring>TextLabel3</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <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"> <property name="name">
<cstring>TextLabel5</cstring> <cstring>TextLabel5</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -222,7 +222,7 @@ This information will be seen and used only by you. The information is used to p
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>20</height> <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"> <property name="name">
<cstring>frame8_2</cstring> <cstring>frame8_2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>25</width> <width>25</width>
<height>0</height> <height>0</height>

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

@ -53,7 +53,7 @@ On the next few pages you will be guided through the steps necessary to setup th
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>41</height> <height>41</height>

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

@ -279,7 +279,7 @@ AccountPage::AccountPage(Wizard* wizard, const char* name) :
connect(m_mandatoryGroup, TQT_SIGNAL(stateChanged()), object(), TQT_SIGNAL(completeStateChanged())); connect(m_mandatoryGroup, TQT_SIGNAL(stateChanged()), object(), TQT_SIGNAL(completeStateChanged()));
connect(m_haveCheckingAccountButton, TQT_SIGNAL(toggled(bool)), object(), TQT_SIGNAL(completeStateChanged())); connect(m_haveCheckingAccountButton, TQT_SIGNAL(toggled(bool)), object(), TQT_SIGNAL(completeStateChanged()));
m_accountNameEdit->setFocus(); 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 KMyMoneyWizardPage* AccountPage::nextPage(void) const

4
kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui
Unescape View File

@ -45,7 +45,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>51</width> <width>51</width>
<height>20</height> <height>20</height>
@ -72,7 +72,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>31</height> <height>31</height>

2
kmymoney2/wizards/wizardpages/accountsdecl.ui
Unescape View File

@ -39,7 +39,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
kmymoney2/wizards/wizardpages/currencydecl.ui
Unescape View File

@ -83,7 +83,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>31</height> <height>31</height>

16
kmymoney2/wizards/wizardpages/userinfodecl.ui
Unescape View File

@ -38,7 +38,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel3</cstring> <cstring>TextLabel3</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -52,7 +52,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel4</cstring> <cstring>TextLabel4</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -66,7 +66,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel2</cstring> <cstring>TextLabel2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -100,7 +100,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel7</cstring> <cstring>TextLabel7</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -114,7 +114,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel6</cstring> <cstring>TextLabel6</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -158,7 +158,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>305</width> <width>305</width>
<height>21</height> <height>21</height>
@ -177,7 +177,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -193,7 +193,7 @@
<property name="name"> <property name="name">
<cstring>TextLabel5</cstring> <cstring>TextLabel5</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>

20
libkdchart/KDChart.cpp
Unescape View File

@ -388,7 +388,7 @@ void KDChart::initInterpreter( TQSInterpreter* interpreter )
void KDChart::initProject( TQSProject* project ) void KDChart::initProject( TQSProject* project )
{ {
project->createScript( TQString::tqfromLatin1( "KDCHART_Globals" ), globals() ); project->createScript( TQString::fromLatin1( "KDCHART_Globals" ), globals() );
privateInitInterpreter( project->interpreter() ); privateInitInterpreter( project->interpreter() );
} }
@ -431,19 +431,19 @@ TQString KDChart::globals()
for( TQMapIterator<char*,double> it= intMap.begin(); it != intMap.end(); ++it ) { for( TQMapIterator<char*,double> it= intMap.begin(); it != intMap.end(); ++it ) {
// This is written this way to be efficient // This is written this way to be efficient
globals += TQString::tqfromLatin1( "const " ); globals += TQString::fromLatin1( "const " );
globals += it.key(); globals += it.key();
globals += " = "; globals += " = ";
globals += TQString::number( it.data() ); globals += TQString::number( it.data() );
globals += ";\n"; globals += ";\n";
} }
globals += TQString::tqfromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" ) globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" )
.tqarg( TQString::tqfromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) ); .tqarg( TQString::fromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) );
globals += TQString::tqfromLatin1( "const KDCHART_AXIS_LABELS_AUTO_LIMIT = 140319.64;\n" ); globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_LIMIT = 140319.64;\n" );
globals += TQString::tqfromLatin1( "const KDCHART_DEFAULT_AXIS_GRID_COLOR = new Color(\"%1\");\n" ) globals += TQString::fromLatin1( "const KDCHART_DEFAULT_AXIS_GRID_COLOR = new Color(\"%1\");\n" )
.tqarg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name()); .tqarg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name());
globals += TQString::tqfromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" ) globals += TQString::fromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" )
.tqarg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name()); .tqarg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name());
@ -469,14 +469,14 @@ TQString KDChart::globals()
colorMap.insert( "TQt.darkYellow", TQt::darkYellow ); colorMap.insert( "TQt.darkYellow", TQt::darkYellow );
for( TQMapIterator<char*,TQColor> it2= colorMap.begin(); it2 != colorMap.end(); ++it2 ) { for( TQMapIterator<char*,TQColor> it2= colorMap.begin(); it2 != colorMap.end(); ++it2 ) {
// This is written this way to be efficient // This is written this way to be efficient
globals += TQString::tqfromLatin1( it2.key() ); globals += TQString::fromLatin1( it2.key() );
globals += TQString::tqfromLatin1( " = new Color( " ); globals += TQString::fromLatin1( " = new Color( " );
globals += TQString::number( it2.data().red() ); globals += TQString::number( it2.data().red() );
globals += ','; globals += ',';
globals += TQString::number( it2.data().green() ); globals += TQString::number( it2.data().green() );
globals += ','; globals += ',';
globals += TQString::number( it2.data().blue() ); globals += TQString::number( it2.data().blue() );
globals += TQString::tqfromLatin1( " );\n" ); globals += TQString::fromLatin1( " );\n" );
} }
//qDebug( "%s",globals.latin1() ); //qDebug( "%s",globals.latin1() );
return globals; return globals;

6
libkdchart/KDChartAxesPainter.cpp
Unescape View File

@ -680,7 +680,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
anchor.setY( p2.y() + static_cast < int > ( pYDelta * (iLabel - 0.5) ) ); anchor.setY( p2.y() + static_cast < int > ( pYDelta * (iLabel - 0.5) ) );
// allow for shearing and/or scaling of the painter // allow for shearing and/or scaling of the painter
anchor = painter->tqworldMatrix().map( anchor ); anchor = painter->worldMatrix().map( anchor );
TQString text; TQString text;
if( cv.isDateTime ){ if( cv.isDateTime ){
@ -1762,7 +1762,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
KDDrawText::drawRotatedText( KDDrawText::drawRotatedText(
painter, painter,
nRotation, nRotation,
painter->tqworldMatrix().map( painter->worldMatrix().map(
TQPoint( static_cast<int>( cv.pTextsX ), TQPoint( static_cast<int>( cv.pTextsX ),
static_cast<int>( cv.pTextsY ) ) ), static_cast<int>( cv.pTextsY ) ) ),
label, label,
@ -4424,7 +4424,7 @@ void KDChartAxesPainter::paintData( TQPainter* painter,
//ourClipRect.setLeft( ourClipRect.left() + 1 ); //ourClipRect.setLeft( ourClipRect.left() + 1 );
//ourClipRect.setRight( ourClipRect.right() - 1 ); //ourClipRect.setRight( ourClipRect.right() - 1 );
const TQWMatrix & world = painter->tqworldMatrix(); const TQWMatrix & world = painter->worldMatrix();
ourClipRect = ourClipRect =
#if COMPAT_TQT_VERSION >= 0x030000 #if COMPAT_TQT_VERSION >= 0x030000
world.mapRect( ourClipRect ); world.mapRect( ourClipRect );

58
libkdchart/KDChartObjectFactory.cpp
Unescape View File

@ -15,42 +15,42 @@
// PENDING(blackie) Clean up code in this file, so it uses the correct getter methods like getBool. // PENDING(blackie) Clean up code in this file, so it uses the correct getter methods like getBool.
KDChartObjectFactory::KDChartObjectFactory() KDChartObjectFactory::KDChartObjectFactory()
{ {
registerClass( TQString::tqfromLatin1( "KDChartWidget" ) ); registerClass( TQString::fromLatin1( "KDChartWidget" ) );
registerClass( TQString::tqfromLatin1( "KDChartParams" ), new KDChartParams ); registerClass( TQString::fromLatin1( "KDChartParams" ), new KDChartParams );
registerClass( TQString::tqfromLatin1( "KDChartTableData" ) ); registerClass( TQString::fromLatin1( "KDChartTableData" ) );
registerClass( TQString::tqfromLatin1( "KDChartAxisParams" ), new KDChartAxisParams ); registerClass( TQString::fromLatin1( "KDChartAxisParams" ), new KDChartAxisParams );
registerClass( TQString::tqfromLatin1( "KDChartEnums" ), 0, new KDChartEnums ); registerClass( TQString::fromLatin1( "KDChartEnums" ), 0, new KDChartEnums );
registerClass( TQString::tqfromLatin1( "KDChartTextPiece" ) ); registerClass( TQString::fromLatin1( "KDChartTextPiece" ) );
registerClass( TQString::tqfromLatin1( "KDChartCustomBox" ), new KDChartCustomBox ); registerClass( TQString::fromLatin1( "KDChartCustomBox" ), new KDChartCustomBox );
registerClass( TQString::tqfromLatin1( "KDChartPropertySet" ), new KDChartPropertySet ); registerClass( TQString::fromLatin1( "KDChartPropertySet" ), new KDChartPropertySet );
registerClass( TQString::tqfromLatin1( "KDFrame" ), TQString(), new KDFrame ); registerClass( TQString::fromLatin1( "KDFrame" ), TQString(), new KDFrame );
registerClass( TQString::tqfromLatin1( "TQt" ), TQString(), new TQtFactory() ); registerClass( TQString::fromLatin1( "TQt" ), TQString(), new TQtFactory() );
registerClass( TQString::tqfromLatin1( "TQFont" ), TQString(), new TQFontFactory ); registerClass( TQString::fromLatin1( "TQFont" ), TQString(), new TQFontFactory );
} }
TQObject* KDChartObjectFactory::create( const TQString& className, const TQSArgumentList& args, TQObject* /*context*/ ) TQObject* KDChartObjectFactory::create( const TQString& className, const TQSArgumentList& args, TQObject* /*context*/ )
{ {
if ( className == TQString::tqfromLatin1( "KDChartWidget" ) ) if ( className == TQString::fromLatin1( "KDChartWidget" ) )
return createKDChartWidget( args ); return createKDChartWidget( args );
if ( className == TQString::tqfromLatin1("KDChartParams") ) if ( className == TQString::fromLatin1("KDChartParams") )
return new KDChartParams(); return new KDChartParams();
else if ( className == TQString::tqfromLatin1("KDChartTableData") ) else if ( className == TQString::fromLatin1("KDChartTableData") )
return createKDChartTableData( args ); return createKDChartTableData( args );
else if ( className == TQString::tqfromLatin1("KDChartAxisParams") ) else if ( className == TQString::fromLatin1("KDChartAxisParams") )
return new KDChartAxisParams(); return new KDChartAxisParams();
else if ( className == TQString::tqfromLatin1( "KDChartTextPiece" ) ) else if ( className == TQString::fromLatin1( "KDChartTextPiece" ) )
return createKDChartTextPiece( args ); return createKDChartTextPiece( args );
else if ( className == TQString::tqfromLatin1( "KDChartCustomBox" ) ) else if ( className == TQString::fromLatin1( "KDChartCustomBox" ) )
return createKDChartCustomBox( args ); return createKDChartCustomBox( args );
else if ( className == TQString::tqfromLatin1( "KDChartPropertySet" ) ) else if ( className == TQString::fromLatin1( "KDChartPropertySet" ) )
return createKDChartPropertySet( args ); return createKDChartPropertySet( args );
else else
@ -98,7 +98,7 @@ TQObject* KDChartObjectFactory::createKDChartTextPiece( const TQSArgumentList& a
TQString str; TQString str;
if ( !getString( args, 1, &str, "KDChartTextPiece" ) ) return 0; if ( !getString( args, 1, &str, "KDChartTextPiece" ) ) return 0;
if ( !checkIsTQtVariant( args, 2, TQVariant::Font, TQString::tqfromLatin1( "TQFont" ), "KDChartTextPiece" ) ) return 0; if ( !checkIsTQtVariant( args, 2, TQVariant::Font, TQString::fromLatin1( "TQFont" ), "KDChartTextPiece" ) ) return 0;
TQFont font = args[1].variant().toFont(); TQFont font = args[1].variant().toFont();
return new KDChartTextPiece( str, font ); return new KDChartTextPiece( str, font );
@ -145,13 +145,13 @@ TQObject* KDChartObjectFactory::createKDChartCustomBox( const TQSArgumentList& a
TQColor color = TQt::black; TQColor color = TQt::black;
if ( args.count() >= 9 ) { if ( args.count() >= 9 ) {
if ( !checkIsTQtVariant( args, 9, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0; if ( !checkIsTQtVariant( args, 9, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
color = args[8].variant().toColor(); color = args[8].variant().toColor();
} }
TQBrush paper = TQt::NoBrush; TQBrush paper = TQt::NoBrush;
if ( args.count() >= 10 ) { if ( args.count() >= 10 ) {
if ( !checkIsTQtVariant( args, 10, TQVariant::Brush, TQString::tqfromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0; if ( !checkIsTQtVariant( args, 10, TQVariant::Brush, TQString::fromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
paper = args[9].variant().toBrush(); paper = args[9].variant().toBrush();
} }
@ -235,13 +235,13 @@ TQObject* KDChartObjectFactory::createKDChartCustomBox( const TQSArgumentList& a
TQColor color = TQt::black; TQColor color = TQt::black;
if ( args.count() >= 8 ) { if ( args.count() >= 8 ) {
if ( !checkIsTQtVariant( args, 8, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0; if ( !checkIsTQtVariant( args, 8, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
color = args[7].variant().toColor(); color = args[7].variant().toColor();
} }
TQBrush paper = TQt::NoBrush; TQBrush paper = TQt::NoBrush;
if ( args.count() >= 9 ) { if ( args.count() >= 9 ) {
if ( !checkIsTQtVariant( args, 9, TQVariant::Brush, TQString::tqfromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0; if ( !checkIsTQtVariant( args, 9, TQVariant::Brush, TQString::fromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
paper = args[8].variant().toBrush(); paper = args[8].variant().toBrush();
} }
@ -318,7 +318,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
if ( !getNumber( args, 4,&idLineColor, "KDChartPropertySet" ) ) return 0; if ( !getNumber( args, 4,&idLineColor, "KDChartPropertySet" ) ) return 0;
if ( !checkIsTQtVariant( args, 5, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; if ( !checkIsTQtVariant( args, 5, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
TQColor lineColor = args[4].variant().toColor(); TQColor lineColor = args[4].variant().toColor();
int idLineStyle; int idLineStyle;
@ -362,7 +362,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
int idExtraLinesColor; int idExtraLinesColor;
if ( !getNumber( args, 18,&idExtraLinesColor, "KDChartPropertySet" ) ) return 0; if ( !getNumber( args, 18,&idExtraLinesColor, "KDChartPropertySet" ) ) return 0;
if ( !checkIsTQtVariant( args, 19, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; if ( !checkIsTQtVariant( args, 19, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
TQColor extraLinesColor = args[18].variant().toColor(); TQColor extraLinesColor = args[18].variant().toColor();
int idExtraLinesStyle; int idExtraLinesStyle;
@ -380,13 +380,13 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
int idExtraMarkersSize; int idExtraMarkersSize;
if ( !getNumber( args, 24,&idExtraMarkersSize, "KDChartPropertySet" ) ) return 0; if ( !getNumber( args, 24,&idExtraMarkersSize, "KDChartPropertySet" ) ) return 0;
if ( !checkIsTQtVariant( args, 25, TQVariant::Size, TQString::tqfromLatin1( "TQSize" ), "KDChartPropertySet" ) ) return 0; if ( !checkIsTQtVariant( args, 25, TQVariant::Size, TQString::fromLatin1( "TQSize" ), "KDChartPropertySet" ) ) return 0;
TQSize extraMarkersSize = args[24].variant().toSize(); TQSize extraMarkersSize = args[24].variant().toSize();
int idExtraMarkersColor; int idExtraMarkersColor;
if ( !getNumber( args, 26,&idExtraMarkersColor, "KDChartPropertySet" ) ) return 0; if ( !getNumber( args, 26,&idExtraMarkersColor, "KDChartPropertySet" ) ) return 0;
if ( !checkIsTQtVariant( args, 27, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; if ( !checkIsTQtVariant( args, 27, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
TQColor extraMarkersColor = args[26].variant().toColor(); TQColor extraMarkersColor = args[26].variant().toColor();
int idExtraMarkersStyle; int idExtraMarkersStyle;
@ -404,7 +404,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
int idBarColor; int idBarColor;
if ( !getNumber( args, 32,&idBarColor, "KDChartPropertySet" ) ) return 0; if ( !getNumber( args, 32,&idBarColor, "KDChartPropertySet" ) ) return 0;
if ( !checkIsTQtVariant( args, 33, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; if ( !checkIsTQtVariant( args, 33, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
TQColor barColor = args[32].variant().toColor(); TQColor barColor = args[32].variant().toColor();
KDChartPropertySet* set = new KDChartPropertySet; KDChartPropertySet* set = new KDChartPropertySet;

4
libkdchart/KDChartPainter.cpp
Unescape View File

@ -657,7 +657,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter,
} }
if ( rotation ) { if ( rotation ) {
anchor = painter->tqworldMatrix().map( anchor ); anchor = painter->worldMatrix().map( anchor );
// Temporary solution for fixing the data labels size // Temporary solution for fixing the data labels size
// bug when in TQPrinter::HighResolution mode: // bug when in TQPrinter::HighResolution mode:
@ -707,7 +707,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter,
true, true,
true, true,
5 ); 5 );
//anchor = painter->tqworldMatrix().map( anchor ); //anchor = painter->worldMatrix().map( anchor );
if( allowOverlapping ) { if( allowOverlapping ) {
drawThisOne = true; drawThisOne = true;

2
libkdchart/KDChartPiePainter.cpp
Unescape View File

@ -89,7 +89,7 @@ void KDChartPiePainter::paintData( TQPainter* painter,
TQRect ourClipRect( _dataRect ); TQRect ourClipRect( _dataRect );
ourClipRect.addCoords( -1,-1,1,1 ); ourClipRect.addCoords( -1,-1,1,1 );
const TQWMatrix & world = painter->tqworldMatrix(); const TQWMatrix & world = painter->worldMatrix();
ourClipRect = ourClipRect =
#if COMPAT_TQT_VERSION >= 0x030000 #if COMPAT_TQT_VERSION >= 0x030000
world.mapRect( ourClipRect ); world.mapRect( ourClipRect );

8
libkdchart/KDChartPolarPainter.cpp
Unescape View File

@ -89,7 +89,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter,
// PENDING(khz) adjust the clip rect if neccessary... // PENDING(khz) adjust the clip rect if neccessary...
// //
const TQWMatrix & world = painter->tqworldMatrix(); const TQWMatrix & world = painter->worldMatrix();
ourClipRect = ourClipRect =
#if COMPAT_TQT_VERSION >= 0x030000 #if COMPAT_TQT_VERSION >= 0x030000
world.mapRect( ourClipRect ); world.mapRect( ourClipRect );
@ -515,7 +515,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter,
pt2 = center + polarToXY( r2, currentAngle ); pt2 = center + polarToXY( r2, currentAngle );
pt3 = center + polarToXY( r3, currentAngle ); pt3 = center + polarToXY( r3, currentAngle );
//pt3 = painter->tqworldMatrix().map( pt3 ); //pt3 = painter->worldMatrix().map( pt3 );
if( paraSagittal.axisShowGrid() ) { if( paraSagittal.axisShowGrid() ) {
painter->setPen( TQPen( paraSagittal.axisGridColor(), painter->setPen( TQPen( paraSagittal.axisGridColor(),
@ -538,7 +538,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter,
KDDrawText::drawRotatedText( painter, KDDrawText::drawRotatedText( painter,
currentAngle+90, currentAngle+90,
painter->tqworldMatrix().map(pt3), painter->worldMatrix().map(pt3),
label, label,
0, 0,
TQt::AlignCenter ); TQt::AlignCenter );
@ -673,7 +673,7 @@ void KDChartPolarPainter::paintCircularAxisLabel( TQPainter* painter,
KDDrawText::drawRotatedText( KDDrawText::drawRotatedText(
painter, painter,
rotate ? txtAngle - 90 : 0, rotate ? txtAngle - 90 : 0,
painter->tqworldMatrix().map(center - polarToXY( static_cast<int>( currentRadiusPPU ), txtAngle )), painter->worldMatrix().map(center - polarToXY( static_cast<int>( currentRadiusPPU ), txtAngle )),
txt, txt,
0, 0,
step step

2
libkdchart/KDChartRingPainter.cpp
Unescape View File

@ -84,7 +84,7 @@ void KDChartRingPainter::paintData( TQPainter* painter,
TQRect ourClipRect( _dataRect ); TQRect ourClipRect( _dataRect );
const TQWMatrix & world = painter->tqworldMatrix(); const TQWMatrix & world = painter->worldMatrix();
ourClipRect = ourClipRect =
#if COMPAT_TQT_VERSION >= 0x030000 #if COMPAT_TQT_VERSION >= 0x030000
world.mapRect( ourClipRect ); world.mapRect( ourClipRect );

2
libkdchart/KDChartTableBase.cpp
Unescape View File

@ -74,7 +74,7 @@
future absicssa axis value: future absicssa axis value:
\verbatim \verbatim
const TQDateTime currentTime( TQDateTime::tqcurrentDateTime() ); const TQDateTime currentTime( TQDateTime::currentDateTime() );
for( int iCell = 0; iCell < usedValues; ++iCell ){ for( int iCell = 0; iCell < usedValues; ++iCell ){
KDChartData& cell = myData.cell( 0, iCell ); KDChartData& cell = myData.cell( 0, iCell );
// assign special property set ID if X value is in the future // assign special property set ID if X value is in the future

8
libkdchart/KDChartWrapperFactory.cpp
Unescape View File

@ -17,16 +17,16 @@ KDChartWrapperFactory::KDChartWrapperFactory()
TQObject* KDChartWrapperFactory::create( const TQString& className, void* ptr ) TQObject* KDChartWrapperFactory::create( const TQString& className, void* ptr )
{ {
if ( className == TQString::tqfromLatin1( "KDChartParams" ) ) if ( className == TQString::fromLatin1( "KDChartParams" ) )
return new KDChartParamsWrapper( static_cast<KDChartParams*>( ptr ) ); return new KDChartParamsWrapper( static_cast<KDChartParams*>( ptr ) );
if ( className == TQString::tqfromLatin1( "KDChartVectorTableData" ) ) if ( className == TQString::fromLatin1( "KDChartVectorTableData" ) )
return new KDChartTableDataWrapper( static_cast<KDChartTableData*>( ptr ) ); return new KDChartTableDataWrapper( static_cast<KDChartTableData*>( ptr ) );
if ( className == TQString::tqfromLatin1( "KDChartCustomBox" ) ) if ( className == TQString::fromLatin1( "KDChartCustomBox" ) )
return new KDChartCustomBoxWrapper( static_cast<KDChartCustomBox*>( ptr ) ); return new KDChartCustomBoxWrapper( static_cast<KDChartCustomBox*>( ptr ) );
if ( className == TQString::tqfromLatin1( "KDChartAxisParams" ) ) if ( className == TQString::fromLatin1( "KDChartAxisParams" ) )
return new KDChartAxisParamsWrapper( static_cast<KDChartAxisParams*>( ptr ) ); return new KDChartAxisParamsWrapper( static_cast<KDChartAxisParams*>( ptr ) );
return 0; return 0;

8
libkgpgfile/kgpgfile.cpp
Unescape View File

@ -85,7 +85,7 @@ KGPGFile::~KGPGFile()
void KGPGFile::init(void) void KGPGFile::init(void)
{ {
setFlags(IO_Sequential); setFlags(IO_Sequential);
setqStatus(IO_Ok); seStatus(IO_Ok);
setState(0); setState(0);
} }
@ -253,7 +253,7 @@ bool KGPGFile::startProcess(const TQStringList& args)
} }
// let the process settle and see if it starts and survives ;-) // let the process settle and see if it starts and survives ;-)
kapp->tqprocessEvents(100); kapp->processEvents(100);
return true; return true;
} }
@ -444,7 +444,7 @@ void KGPGFile::slotGPGExited(KProcess* )
if(m_process->normalExit()) { if(m_process->normalExit()) {
m_exitStatus = m_process->exitStatus(); m_exitStatus = m_process->exitStatus();
if(m_exitStatus != 0) if(m_exitStatus != 0)
setqStatus(IO_UnspecifiedError); seStatus(IO_UnspecifiedError);
} else { } else {
m_exitStatus = -1; m_exitStatus = -1;
} }
@ -567,7 +567,7 @@ void KGPGFile::publicKeyList(TQStringList& list, const TQString& pattern)
TQString val; TQString val;
if(fields[0] == "pub") { if(fields[0] == "pub") {
TQDate expiration = TQDate::fromString(fields[6], Qt::ISODate); TQDate expiration = TQDate::fromString(fields[6], Qt::ISODate);
if(expiration > TQDate::tqcurrentDate()) { if(expiration > TQDate::currentDate()) {
currentKey = fields[4]; currentKey = fields[4];
val = TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]); val = TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]);
map[val] = val; map[val] = val;

Write Preview
Loading…
Cancel
Save