diff --git a/kmymoney2/converter/convertertest.cpp b/kmymoney2/converter/convertertest.cpp
index 739c6f3..bbe0ec4 100644
--- a/kmymoney2/converter/convertertest.cpp
+++ b/kmymoney2/converter/convertertest.cpp
@@ -112,8 +112,8 @@ void ConverterTest::testWebQuotes()
CPPUNIT_ASSERT(qr.m_errors.count() == 0);
// Quote date should be within the last week, or something bad is going on.
- CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate());
- CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7));
+ CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate());
+ CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7));
// Quote value should at least be positive
CPPUNIT_ASSERT(qr.m_price.isPositive());
@@ -123,8 +123,8 @@ void ConverterTest::testWebQuotes()
// kdDebug(2) << "ConverterTest::testWebQuotes(): quote for " << q.m_symbol << " on " << qr.m_date.toString() << " is " << qr.m_price.toString() << " errors(" << qr.m_errors.count() << "): " << qr.m_errors.join(" /// ") << endl;
CPPUNIT_ASSERT(qr.m_errors.count() == 0);
- CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1));
- CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7));
+ CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1));
+ CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7));
CPPUNIT_ASSERT(qr.m_price.isPositive());
q.launch("EUR > USD","Yahoo Currency");
@@ -132,8 +132,8 @@ void ConverterTest::testWebQuotes()
// kdDebug(2) << "ConverterTest::testWebQuotes(): quote for " << q.m_symbol << " on " << qr.m_date.toString() << " is " << qr.m_price.toString() << " errors(" << qr.m_errors.count() << "): " << qr.m_errors.join(" /// ") << endl;
CPPUNIT_ASSERT(qr.m_errors.count() == 0);
- CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1));
- CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7));
+ CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1));
+ CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7));
CPPUNIT_ASSERT(qr.m_price.isPositive());
q.launch("50492","Globe & Mail");
@@ -141,8 +141,8 @@ void ConverterTest::testWebQuotes()
// kdDebug(2) << "ConverterTest::testWebQuotes(): quote for " << q.m_symbol << " on " << qr.m_date.toString() << " is " << qr.m_price.toString() << " errors(" << qr.m_errors.count() << "): " << qr.m_errors.join(" /// ") << endl;
CPPUNIT_ASSERT(qr.m_errors.count() == 0);
- CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1));
- CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7));
+ CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1));
+ CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7));
CPPUNIT_ASSERT(qr.m_price.isPositive());
q.launch("TDB647","MSN.CA");
@@ -150,8 +150,8 @@ void ConverterTest::testWebQuotes()
// kdDebug(2) << "ConverterTest::testWebQuotes(): quote for " << q.m_symbol << " on " << qr.m_date.toString() << " is " << qr.m_price.toString() << " errors(" << qr.m_errors.count() << "): " << qr.m_errors.join(" /// ") << endl;
CPPUNIT_ASSERT(qr.m_errors.count() == 0);
- CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1));
- CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7));
+ CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1));
+ CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7));
CPPUNIT_ASSERT(qr.m_price.isPositive());
}
diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp
index bfd6911..9be8003 100644
--- a/kmymoney2/converter/mymoneygncreader.cpp
+++ b/kmymoney2/converter/mymoneygncreader.cpp
@@ -1192,10 +1192,10 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
acc.setDescription(gac->desc());
- TQDate tqcurrentDate = TQDate::tqcurrentDate();
- acc.setOpeningDate(tqcurrentDate);
- acc.setLastModified(tqcurrentDate);
- acc.setLastReconciliationDate(tqcurrentDate);
+ TQDate currentDate = TQDate::currentDate();
+ acc.setOpeningDate(currentDate);
+ acc.setLastModified(currentDate);
+ acc.setLastReconciliationDate(currentDate);
if (gac->commodity()->isCurrency()) {
acc.setCurrencyId (gac->commodity()->id().utf8());
m_currencyCount[gac->commodity()->id()]++;
@@ -1717,7 +1717,7 @@ void MyMoneyGncReader::convertSchedule (const GncSchedule *gsc) {
MyMoneyTransaction tx;
m_suspectSchedule = false;
TQDate startDate, nextDate, lastDate, endDate; // for date calculations
- TQDate today = TQDate::tqcurrentDate();
+ TQDate today = TQDate::currentDate();
int numOccurs, remOccurs;
if (m_scheduleCount == 0) signalProgress (0, m_gncScheduleCount, i18n("Loading schedules..."));
@@ -2139,7 +2139,7 @@ TQString MyMoneyGncReader::createOrphanAccount (const TQString& gncName) {
acc.setName ("orphan_" + gncName);
acc.setDescription (i18n("Orphan created from unknown gnucash account"));
- TQDate today = TQDate::tqcurrentDate();
+ TQDate today = TQDate::currentDate();
acc.setOpeningDate (today);
acc.setLastModified (today);
diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp
index 809d71c..75aca75 100644
--- a/kmymoney2/converter/mymoneyqifreader.cpp
+++ b/kmymoney2/converter/mymoneyqifreader.cpp
@@ -460,7 +460,7 @@ bool MyMoneyQifReader::finishImport(void)
// remove the Don't ask again entries
KConfig* config = KGlobal::config();
- config->setGroup(TQString::tqfromLatin1("Notification Messages"));
+ config->setGroup(TQString::fromLatin1("Notification Messages"));
TQStringList::ConstIterator it;
for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++it) {
@@ -480,7 +480,7 @@ bool MyMoneyQifReader::finishImport(void)
// remove the Don't ask again entries
KConfig* config = KGlobal::config();
- config->setGroup(TQString::tqfromLatin1("Notification Messages"));
+ config->setGroup(TQString::fromLatin1("Notification Messages"));
TQStringList::ConstIterator it;
for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++it) {
@@ -1058,7 +1058,7 @@ void MyMoneyQifReader::processTransactionEntry(void)
i18n("Invalid date format"));
switch(rc) {
case KMessageBox::Continue:
- tr.m_datePosted = (TQDate::tqcurrentDate());
+ tr.m_datePosted = (TQDate::currentDate());
break;
case KMessageBox::Cancel:
@@ -1305,7 +1305,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void)
i18n("Invalid date format"));
switch(rc) {
case KMessageBox::Continue:
- tr.m_datePosted = TQDate::tqcurrentDate();
+ tr.m_datePosted = TQDate::currentDate();
break;
case KMessageBox::Cancel:
diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp
index f25eed4..8f8f7d0 100644
--- a/kmymoney2/converter/mymoneystatementreader.cpp
+++ b/kmymoney2/converter/mymoneystatementreader.cpp
@@ -402,7 +402,7 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes
// remove the Don't ask again entries
KConfig* config = KGlobal::config();
- config->setGroup(TQString::tqfromLatin1("Notification Messages"));
+ config->setGroup(TQString::fromLatin1("Notification Messages"));
TQStringList::ConstIterator it;
for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++it) {
diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp
index 7732e54..0fab2b9 100644
--- a/kmymoney2/converter/webpricequote.cpp
+++ b/kmymoney2/converter/webpricequote.cpp
@@ -382,7 +382,7 @@ void WebPriceQuote::slotParseQuote(const TQString& _quotedata)
catch (MyMoneyException* e)
{
// emit error(i18n("Unable to parse date %1 using format %2: %3").tqarg(datestr,dateparse.format(),e->what()));
- m_date = TQDate::tqcurrentDate();
+ m_date = TQDate::currentDate();
gotdate = true;
delete e;
}
@@ -1016,7 +1016,7 @@ convertertest::QuoteReceiver::QuoteReceiver(WebPriceQuote* q, TQObject* parent,
connect(q,TQT_SIGNAL(quote(const TQString&,const TQDate&, const double&)),
this,TQT_SLOT(slotGetQuote(const TQString&,const TQDate&, const double&)));
connect(q,TQT_SIGNAL(status(const TQString&)),
- this,TQT_SLOT(slottqStatus(const TQString&)));
+ this,TQT_SLOT(slotStatus(const TQString&)));
connect(q,TQT_SIGNAL(error(const TQString&)),
this,TQT_SLOT(slotError(const TQString&)));
}
@@ -1032,7 +1032,7 @@ void convertertest::QuoteReceiver::slotGetQuote(const TQString&,const TQDate& d,
m_price = MyMoneyMoney(m);
m_date = d;
}
-void convertertest::QuoteReceiver::slottqStatus(const TQString& msg)
+void convertertest::QuoteReceiver::slotStatus(const TQString& msg)
{
// kdDebug(2) << "test::QuoteReceiver::slotStatus( " << msg << " )" << endl;
diff --git a/kmymoney2/converter/webpricequote.h b/kmymoney2/converter/webpricequote.h
index ada7684..377ba8d 100644
--- a/kmymoney2/converter/webpricequote.h
+++ b/kmymoney2/converter/webpricequote.h
@@ -217,7 +217,7 @@ class MyMoneyDateFormat
public:
MyMoneyDateFormat(const TQString& _format): m_format(_format) {}
TQString convertDate(const TQDate& _in) const;
- TQDate convertString(const TQString& _in, bool _strict=true, unsigned _centurymidpoint = TQDate::tqcurrentDate().year() ) const;
+ TQDate convertString(const TQString& _in, bool _strict=true, unsigned _centurymidpoint = TQDate::currentDate().year() ) const;
const TQString& format(void) const { return m_format; }
private:
TQString m_format;
@@ -239,7 +239,7 @@ public:
~QuoteReceiver();
public slots:
void slotGetQuote(const TQString&,const TQDate&, const double&);
- void slottqStatus(const TQString&);
+ void slotStatus(const TQString&);
void slotError(const TQString&);
public:
TQStringList m_statuses;
diff --git a/kmymoney2/dialogs/investtransactioneditor.cpp b/kmymoney2/dialogs/investtransactioneditor.cpp
index 92ea338..1f6f6da 100644
--- a/kmymoney2/dialogs/investtransactioneditor.cpp
+++ b/kmymoney2/dialogs/investtransactioneditor.cpp
@@ -279,39 +279,39 @@ void InvestTransactionEditor::createEditWidgets(void)
}
TQLabel* label = new TQLabel("", 0);
- label->tqsetAlignment(TQt::AlignVCenter | TQt::AlignRight | TQt::DontClip);
+ label->setAlignment(TQt::AlignVCenter | TQt::AlignRight | TQt::DontClip);
m_editWidgets["total"] = label;
label = new TQLabel("", 0);
- label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip);
+ label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["total-label"] = label;
label = new TQLabel("", 0);
- label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip);
+ label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["asset-label"] = label;
label = new TQLabel("", 0);
- label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip);
+ label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["fee-label"] = label;
label = new TQLabel("", 0);
- label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip);
+ label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["fee-amount-label"] = label;
label = new TQLabel("", 0);
- label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip);
+ label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["interest-label"] = label;
label = new TQLabel("", 0);
- label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip);
+ label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["interest-amount-label"] = label;
label = new TQLabel("", 0);
- label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip);
+ label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["price-label"] = label;
label = new TQLabel("", 0);
- label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip);
+ label->setAlignment(TQt::AlignVCenter | TQt::DontClip);
m_editWidgets["shares-label"] = label;
// if we don't have more than 1 selected transaction, we don't need
@@ -586,7 +586,7 @@ void InvestTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action /* action
else if(m_lastPostDate.isValid())
postDate->setDate(m_lastPostDate);
else
- postDate->setDate(TQDate::tqcurrentDate());
+ postDate->setDate(TQDate::currentDate());
// security (but only if it's not the investment account)
if(m_split.accountId() != m_account.id()) {
@@ -1014,7 +1014,7 @@ bool InvestTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyM
s0.setReconcileFlag(status->state());
if(s0.reconcileFlag() == MyMoneySplit::Reconciled && !s0.reconcileDate().isValid())
- s0.setReconcileDate(TQDate::tqcurrentDate());
+ s0.setReconcileDate(TQDate::currentDate());
// call the creation logic for the current selected activity
bool rc = d->m_activity->createTransaction(t, s0, assetAccountSplit, feeSplits, m_feeSplits, interestSplits, m_interestSplits, security, currency);
diff --git a/kmymoney2/dialogs/kaccountselectdlgdecl.ui b/kmymoney2/dialogs/kaccountselectdlgdecl.ui
index 705998a..cdd2557 100644
--- a/kmymoney2/dialogs/kaccountselectdlgdecl.ui
+++ b/kmymoney2/dialogs/kaccountselectdlgdecl.ui
@@ -95,7 +95,7 @@
Expanding
-
+
110
20
@@ -127,7 +127,7 @@
Expanding
-
+
16
20
@@ -184,7 +184,7 @@
Expanding
-
+
160
0
diff --git a/kmymoney2/dialogs/kbackupdlgdecl.ui b/kmymoney2/dialogs/kbackupdlgdecl.ui
index e0e3a7a..14f167a 100644
--- a/kmymoney2/dialogs/kbackupdlgdecl.ui
+++ b/kmymoney2/dialogs/kbackupdlgdecl.ui
@@ -135,7 +135,7 @@ Click OK to perform the backup. If your system does not use an automounter, make
Expanding
-
+
0
24
@@ -168,7 +168,7 @@ Click OK to perform the backup. If your system does not use an automounter, make
Expanding
-
+
455
0
diff --git a/kmymoney2/dialogs/kbalancechartdlg.cpp b/kmymoney2/dialogs/kbalancechartdlg.cpp
index 85134da..1b61272 100644
--- a/kmymoney2/dialogs/kbalancechartdlg.cpp
+++ b/kmymoney2/dialogs/kbalancechartdlg.cpp
@@ -83,7 +83,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare
reportCfg.addAccount(account.id());
reportCfg.setColumnsAreDays( true );
reportCfg.setConvertCurrency( false );
- reportCfg.setDateFilter(TQDate::tqcurrentDate().addDays(-90),TQDate::tqcurrentDate().addDays(+90));
+ reportCfg.setDateFilter(TQDate::currentDate().addDays(-90),TQDate::currentDate().addDays(+90));
reports::PivotTable table(reportCfg);
@@ -213,7 +213,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare
// connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
connect( buttonClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
- resize( TQSize(700, 500).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(700, 500).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
#endif
}
diff --git a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui b/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui
index ee9faa4..666c714 100644
--- a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui
+++ b/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui
@@ -29,7 +29,7 @@
textLabel1
-
+
300
0
@@ -52,7 +52,7 @@
Fixed
-
+
20
16
@@ -82,7 +82,7 @@
Expanding
-
+
20
16
@@ -121,7 +121,7 @@
Expanding
-
+
305
20
diff --git a/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui b/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui
index f52cbca..9ddaed0 100644
--- a/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui
+++ b/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui
@@ -95,7 +95,7 @@ Once you have chosen an import type please press the OK button.
Expanding
- tqsizeHint
+ sizeHint
20
20
@@ -132,7 +132,7 @@ Once you have chosen an import type please press the OK button.
typeCombo
- tqminimumSize
+ minimumSize
100
0
@@ -155,7 +155,7 @@ Once you have chosen an import type please press the OK button.
- tqminimumSize
+ minimumSize
410
100
@@ -195,7 +195,7 @@ Once you have chosen an import type please press the OK button.
Expanding
- tqsizeHint
+ sizeHint
20
20
diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui b/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui
index 5a4b87b..8bdbdce 100644
--- a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui
+++ b/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui
@@ -109,7 +109,7 @@
Expanding
-
+
180
16
diff --git a/kmymoney2/dialogs/kcsvprogressdlgdecl.ui b/kmymoney2/dialogs/kcsvprogressdlgdecl.ui
index d7c0f20..f31e80a 100644
--- a/kmymoney2/dialogs/kcsvprogressdlgdecl.ui
+++ b/kmymoney2/dialogs/kcsvprogressdlgdecl.ui
@@ -187,7 +187,7 @@ You can cancel the process at any time by clicking on the Cancel button.
- tqminimumSize
+ minimumSize
50
0
@@ -243,7 +243,7 @@ You can cancel the process at any time by clicking on the Cancel button.
- tqminimumSize
+ minimumSize
50
0
@@ -303,7 +303,7 @@ You can cancel the process at any time by clicking on the Cancel button.Expanding
- tqsizeHint
+ sizeHint
20
20
@@ -484,7 +484,7 @@ You can cancel the process at any time by clicking on the Cancel button.Expanding
- tqsizeHint
+ sizeHint
20
20
diff --git a/kmymoney2/dialogs/kcurrencycalculator.cpp b/kmymoney2/dialogs/kcurrencycalculator.cpp
index 2306816..9fe4404 100644
--- a/kmymoney2/dialogs/kcurrencycalculator.cpp
+++ b/kmymoney2/dialogs/kcurrencycalculator.cpp
@@ -125,7 +125,7 @@ KCurrencyCalculator::KCurrencyCalculator(const MyMoneySecurity& from, const MyMo
if(date.isValid())
m_dateEdit->setDate(date);
else
- m_dateEdit->setDate(TQDate::tqcurrentDate());
+ m_dateEdit->setDate(TQDate::currentDate());
m_fromCurrencyText->setText(m_fromCurrency.isCurrency() ? m_fromCurrency.id() : m_fromCurrency.tradingSymbol());
m_toCurrencyText->setText(m_toCurrency.isCurrency() ? m_toCurrency.id() : m_toCurrency.tradingSymbol());
diff --git a/kmymoney2/dialogs/kcurrencycalculatordecl.ui b/kmymoney2/dialogs/kcurrencycalculatordecl.ui
index 2d17eb0..3a5ff3c 100644
--- a/kmymoney2/dialogs/kcurrencycalculatordecl.ui
+++ b/kmymoney2/dialogs/kcurrencycalculatordecl.ui
@@ -76,7 +76,7 @@
Expanding
-
+
80
20
@@ -109,7 +109,7 @@
Expanding
-
+
145
20
@@ -329,7 +329,7 @@ xx
Expanding
-
+
20
16
@@ -368,7 +368,7 @@ xx
Expanding
-
+
20
20
diff --git a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui
index cd803cb..fcb3fc8 100644
--- a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui
+++ b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui
@@ -78,7 +78,7 @@
Expanding
-
+
51
21
@@ -103,7 +103,7 @@
Expanding
-
+
61
31
@@ -246,7 +246,7 @@
Expanding
-
+
20
20
diff --git a/kmymoney2/dialogs/keditequityentrydecl.ui b/kmymoney2/dialogs/keditequityentrydecl.ui
index ce06abb..47c1af0 100644
--- a/kmymoney2/dialogs/keditequityentrydecl.ui
+++ b/kmymoney2/dialogs/keditequityentrydecl.ui
@@ -163,7 +163,7 @@
Expanding
-
+
21
21
@@ -204,7 +204,7 @@
Expanding
-
+
21
21
@@ -233,7 +233,7 @@
Expanding
-
+
238
21
diff --git a/kmymoney2/dialogs/keditloanwizard.cpp b/kmymoney2/dialogs/keditloanwizard.cpp
index 89b2f90..d7b372e 100644
--- a/kmymoney2/dialogs/keditloanwizard.cpp
+++ b/kmymoney2/dialogs/keditloanwizard.cpp
@@ -71,7 +71,7 @@ KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, TQWidget *parent
loadWidgets(m_account);
- if(m_account.openingDate() > TQDate::tqcurrentDate()) {
+ if(m_account.openingDate() > TQDate::currentDate()) {
m_effectiveDateNoteLabel->setText(TQString("\n") + i18n(
"Note: you will not be able to modify this account today, because the opening date \"%1\" is in the future. "
"Please revisit this dialog when the time has come."
@@ -123,10 +123,10 @@ void KEditLoanWizard::loadWidgets(const MyMoneyAccount& /* account */)
}
MyMoneyMoney ir;
- if(m_schedule.startDate() > TQDate::tqcurrentDate()) {
+ if(m_schedule.startDate() > TQDate::currentDate()) {
ir = m_account.interestRate(m_schedule.startDate());
} else {
- ir = m_account.interestRate(TQDate::tqcurrentDate());
+ ir = m_account.interestRate(TQDate::currentDate());
}
m_interestRateEdit->loadText(ir.formatMoney("", 3));
m_newInterestRateEdit->loadText(ir.formatMoney("", 3));
@@ -417,7 +417,7 @@ void KEditLoanWizard::slotCheckPageFinished(void)
if(currentPage() == m_effectiveDatePage) {
if(m_effectiveChangeDateEdit->date() < m_account.openingDate()
- || m_effectiveChangeDateEdit->date() > TQDate::tqcurrentDate())
+ || m_effectiveChangeDateEdit->date() > TQDate::currentDate())
nextButton()->setEnabled(false);
} else if(currentPage() == m_interestEditPage) {
diff --git a/kmymoney2/dialogs/keditscheduledlg.cpp b/kmymoney2/dialogs/keditscheduledlg.cpp
index c6ece41..195a232 100644
--- a/kmymoney2/dialogs/keditscheduledlg.cpp
+++ b/kmymoney2/dialogs/keditscheduledlg.cpp
@@ -165,7 +165,7 @@ KEditScheduleDlg::~KEditScheduleDlg()
void KEditScheduleDlg::slotSetupSize(void)
{
- resize(width(), tqminimumSizeHint().height());
+ resize(width(), minimumSizeHint().height());
}
TransactionEditor* KEditScheduleDlg::startEdit(void)
@@ -393,7 +393,7 @@ bool KEditScheduleDlg::focusNextPrevChild(bool next)
TQWidget *w = 0;
TQWidget *currentWidget;
- w = tqApp->tqfocusWidget();
+ w = tqApp->focusWidget();
while(w && d->m_tabOrderWidgets.find(w) == -1) {
// qDebug("'%s' not in list, use parent", w->className());
w = w->parentWidget();
diff --git a/kmymoney2/dialogs/keditscheduledlgdecl.ui b/kmymoney2/dialogs/keditscheduledlgdecl.ui
index d3ec65c..1aeb018 100644
--- a/kmymoney2/dialogs/keditscheduledlgdecl.ui
+++ b/kmymoney2/dialogs/keditscheduledlgdecl.ui
@@ -142,7 +142,7 @@
Expanding
-
+
61
21
@@ -320,7 +320,7 @@
Expanding
-
+
21
20
@@ -372,7 +372,7 @@
Fixed
-
+
20
20
@@ -428,7 +428,7 @@
Expanding
-
+
20
16
@@ -467,7 +467,7 @@
Expanding
-
+
280
0
diff --git a/kmymoney2/dialogs/kendingbalancedlg.cpp b/kmymoney2/dialogs/kendingbalancedlg.cpp
index 9aeb0e1..5c4c337 100644
--- a/kmymoney2/dialogs/kendingbalancedlg.cpp
+++ b/kmymoney2/dialogs/kendingbalancedlg.cpp
@@ -70,7 +70,7 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *pa
MyMoneySecurity currency = MyMoneyFile::instance()->security(account.currencyId());
m_enterInformationLabel->setText(TQString("")+i18n("Please enter the following fields with the information as you find them on your statement. Make sure to enter all values in %1.").tqarg(currency.name())+TQString(""));
- m_statementDate->setDate(TQDate::tqcurrentDate());
+ m_statementDate->setDate(TQDate::currentDate());
// If the previous reconciliation was postponed,
// we show a different first page
@@ -80,7 +80,7 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *pa
// then take the last statement date and add one month and use that as statement
// date.
TQDate lastStatementDate = account.lastReconciliationDate();
- if(lastStatementDate.addMonths(1) < TQDate::tqcurrentDate()) {
+ if(lastStatementDate.addMonths(1) < TQDate::currentDate()) {
m_statementDate->setDate(lastStatementDate.addMonths(1));
}
diff --git a/kmymoney2/dialogs/kendingbalancedlgdecl.ui b/kmymoney2/dialogs/kendingbalancedlgdecl.ui
index 2f67c50..0968bdd 100644
--- a/kmymoney2/dialogs/kendingbalancedlgdecl.ui
+++ b/kmymoney2/dialogs/kendingbalancedlgdecl.ui
@@ -89,7 +89,7 @@ Please enter the following information found on your statement:
Expanding
-
+
0
19
@@ -120,7 +120,7 @@ Please enter the following information found on your statement:
Expanding
-
+
42
0
@@ -179,7 +179,7 @@ Please enter the following information found on your statement:
Expanding
-
+
44
0
@@ -198,7 +198,7 @@ Please enter the following information found on your statement:
Expanding
-
+
0
20
@@ -259,7 +259,7 @@ Please enter the following information found on your statement:
Expanding
-
+
51
0
@@ -318,7 +318,7 @@ Please enter the following information found on your statement:
Expanding
-
+
71
0
@@ -348,7 +348,7 @@ Please enter the following information found on your statement:
Expanding
-
+
0
19
@@ -475,7 +475,7 @@ Please enter the following information found on your statement:
Expanding
-
+
0
25
@@ -547,7 +547,7 @@ All information you have entered into this wizard will be shown and all transact
Expanding
-
+
20
50
@@ -578,7 +578,7 @@ All information you have entered into this wizard will be shown and all transact
Expanding
-
+
42
0
@@ -650,7 +650,7 @@ All information you have entered into this wizard will be shown and all transact
Expanding
-
+
46
0
@@ -669,7 +669,7 @@ All information you have entered into this wizard will be shown and all transact
Expanding
-
+
16
87
@@ -729,7 +729,7 @@ All information you have entered into this wizard will be shown and all transact
Expanding
-
+
16
16
@@ -754,7 +754,7 @@ All information you have entered into this wizard will be shown and all transact
Expanding
-
+
60
20
@@ -924,7 +924,7 @@ All information you have entered into this wizard will be shown and all transact
Expanding
-
+
60
20
@@ -943,7 +943,7 @@ All information you have entered into this wizard will be shown and all transact
Expanding
-
+
16
16
diff --git a/kmymoney2/dialogs/kenterscheduledlg.cpp b/kmymoney2/dialogs/kenterscheduledlg.cpp
index 4c078f1..c225de5 100644
--- a/kmymoney2/dialogs/kenterscheduledlg.cpp
+++ b/kmymoney2/dialogs/kenterscheduledlg.cpp
@@ -175,7 +175,7 @@ void KEnterScheduleDlg::resizeEvent(TQResizeEvent* ev)
void KEnterScheduleDlg::slotSetupSize(void)
{
- resize(width(), tqminimumSizeHint().height());
+ resize(width(), minimumSizeHint().height());
}
int KEnterScheduleDlg::exec(void)
@@ -266,10 +266,10 @@ TransactionEditor* KEnterScheduleDlg::startEdit(void)
// Check if the editor has some preference on where to set the focus
// If not, set the focus to the first widget in the tab order
- TQWidget* tqfocusWidget = editor->firstWidget();
- if(!tqfocusWidget)
- tqfocusWidget = d->m_tabOrderWidgets.first();
- tqfocusWidget->setFocus();
+ TQWidget* focusWidget = editor->firstWidget();
+ if(!focusWidget)
+ focusWidget = d->m_tabOrderWidgets.first();
+ focusWidget->setFocus();
// Make sure, we use the adjusted date
kMyMoneyDateInput* dateEdit = dynamic_cast(editor->haveWidget("postdate"));
@@ -289,7 +289,7 @@ bool KEnterScheduleDlg::focusNextPrevChild(bool next)
TQWidget *w = 0;
TQWidget *currentWidget;
- w = tqApp->tqfocusWidget();
+ w = tqApp->focusWidget();
while(w && d->m_tabOrderWidgets.find(w) == -1) {
// qDebug("'%s' not in list, use parent", w->className());
w = w->parentWidget();
diff --git a/kmymoney2/dialogs/kenterscheduledlgdecl.ui b/kmymoney2/dialogs/kenterscheduledlgdecl.ui
index f36e6b6..d102246 100644
--- a/kmymoney2/dialogs/kenterscheduledlgdecl.ui
+++ b/kmymoney2/dialogs/kenterscheduledlgdecl.ui
@@ -45,7 +45,7 @@
0
-
+
70
0
@@ -79,7 +79,7 @@
0
-
+
70
0
@@ -245,7 +245,7 @@
Expanding
-
+
190
20
diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
index 4121abd..ab752be 100644
--- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
+++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
@@ -104,7 +104,7 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(TQWidget *parent, const TQString& s
if ( file->security( pair.first ).isCurrency() && ( securityId.isEmpty() || ( pair == currencyIds ) ) )
{
const MyMoneyPriceEntries& entries = (*it_price);
- if(entries.count() > 0 && entries.begin().key() <= TQDate::tqcurrentDate()) {
+ if(entries.count() > 0 && entries.begin().key() <= TQDate::currentDate()) {
addPricePair(pair);
btnUpdateAll->setEnabled(true);
}
@@ -282,7 +282,7 @@ void KEquityPriceUpdateDlg::logErrorMessage(const TQString& message)
void KEquityPriceUpdateDlg::logStatusMessage(const TQString& message)
{
- lbtqStatus->append(message);
+ lbStatus->append(message);
}
MyMoneyPrice KEquityPriceUpdateDlg::price(const TQString& id) const
@@ -492,8 +492,8 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQStrin
if ( _price > 0.0f && _date.isValid() )
{
TQDate date = _date;
- if ( date > TQDate::tqcurrentDate() )
- date = TQDate::tqcurrentDate();
+ if ( date > TQDate::currentDate() )
+ date = TQDate::currentDate();
double price = _price;
TQString id = _id.utf8();
diff --git a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui
index e1fb0de..cd9c769 100644
--- a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui
+++ b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui
@@ -24,7 +24,7 @@
lvEquityList
-
+
350
0
@@ -75,7 +75,7 @@
Expanding
-
+
21
20
@@ -105,12 +105,12 @@
textLabel1
- tqStatus:
+ Status:
- lbtqStatus
+ lbStatus
LogText
@@ -139,7 +139,7 @@
Expanding
-
+
91
20
diff --git a/kmymoney2/dialogs/kexportdlgdecl.ui b/kmymoney2/dialogs/kexportdlgdecl.ui
index ab3ff63..e429f53 100644
--- a/kmymoney2/dialogs/kexportdlgdecl.ui
+++ b/kmymoney2/dialogs/kexportdlgdecl.ui
@@ -209,7 +209,7 @@ You can choose the file's path, the account and the format of the QIF file (prof
0
-
+
200
0
@@ -318,7 +318,7 @@ You can choose the file's path, the account and the format of the QIF file (prof
0
-
+
50
0
@@ -340,7 +340,7 @@ You can choose the file's path, the account and the format of the QIF file (prof
0
-
+
50
0
@@ -377,7 +377,7 @@ You can choose the file's path, the account and the format of the QIF file (prof
Expanding
-
+
230
16
@@ -424,7 +424,7 @@ You can choose the file's path, the account and the format of the QIF file (prof
Expanding
-
+
451
0
diff --git a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
index e2a8ee1..3284fa0 100644
--- a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
+++ b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
@@ -84,7 +84,7 @@
Expanding
-
+
16
83
@@ -103,7 +103,7 @@
0
-
+
300
0
@@ -247,7 +247,7 @@
Expanding
-
+
40
20
@@ -266,7 +266,7 @@
Expanding
-
+
20
30
@@ -344,7 +344,7 @@
m_amountToEdit
-
+
100
0
@@ -372,7 +372,7 @@
m_amountEdit
-
+
100
0
@@ -392,7 +392,7 @@
m_amountFromEdit
-
+
100
0
@@ -411,7 +411,7 @@
Expanding
-
+
16
16
@@ -430,7 +430,7 @@
Expanding
-
+
16
75
@@ -554,7 +554,7 @@
Expanding
-
+
0
42
@@ -698,7 +698,7 @@
Expanding
-
+
130
20
@@ -816,7 +816,7 @@
Expanding
-
+
20
20
@@ -835,7 +835,7 @@
Expanding
-
+
16
16
@@ -886,7 +886,7 @@
Expanding
-
+
20
24
@@ -1008,7 +1008,7 @@
Expanding
-
+
51
20
diff --git a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui b/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui
index 39e3711..b40a178 100644
--- a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui
+++ b/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui
@@ -167,7 +167,7 @@
Expanding
-
+
140
20
@@ -254,7 +254,7 @@
Expanding
-
+
20
40
@@ -299,7 +299,7 @@
Expanding
-
+
200
20
diff --git a/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui b/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui
index 6eb3e84..82a2a45 100644
--- a/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui
+++ b/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui
@@ -41,7 +41,7 @@
Expanding
-
+
91
20
@@ -66,7 +66,7 @@
Expanding
-
+
80
20
@@ -94,7 +94,7 @@
Expanding
-
+
171
20
@@ -227,7 +227,7 @@
Expanding
-
+
21
370
diff --git a/kmymoney2/dialogs/kimportdlgdecl.ui b/kmymoney2/dialogs/kimportdlgdecl.ui
index ed879b2..d5075df 100644
--- a/kmymoney2/dialogs/kimportdlgdecl.ui
+++ b/kmymoney2/dialogs/kimportdlgdecl.ui
@@ -131,7 +131,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but
0
-
+
200
0
@@ -204,7 +204,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but
Expanding
-
+
411
0
diff --git a/kmymoney2/dialogs/kloadtemplatedlgdecl.ui b/kmymoney2/dialogs/kloadtemplatedlgdecl.ui
index c857cc8..3b89fcf 100644
--- a/kmymoney2/dialogs/kloadtemplatedlgdecl.ui
+++ b/kmymoney2/dialogs/kloadtemplatedlgdecl.ui
@@ -53,7 +53,7 @@
Expanding
-
+
228
20
diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui
index 6fd5756..43957dd 100644
--- a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui
+++ b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui
@@ -252,7 +252,7 @@
Expanding
-
+
20
20
@@ -305,7 +305,7 @@
Expanding
-
+
120
20
diff --git a/kmymoney2/dialogs/kmymoneypricedlgdecl.ui b/kmymoney2/dialogs/kmymoneypricedlgdecl.ui
index e8a4117..ca39dae 100644
--- a/kmymoney2/dialogs/kmymoneypricedlgdecl.ui
+++ b/kmymoney2/dialogs/kmymoneypricedlgdecl.ui
@@ -100,7 +100,7 @@
Expanding
-
+
21
150
@@ -151,7 +151,7 @@
Expanding
-
+
560
20
diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp
index f549d4c..922b342 100644
--- a/kmymoney2/dialogs/kmymoneysplittable.cpp
+++ b/kmymoney2/dialogs/kmymoneysplittable.cpp
@@ -125,7 +125,7 @@ const TQColor kMyMoneySplitTable::rowBackgroundColor(const int row) const
void kMyMoneySplitTable::paintCell(TQPainter *p, int row, int col, const TQRect& r, bool /*selected*/)
{
- TQColorGroup g = tqcolorGroup();
+ TQColorGroup g = colorGroup();
TQColor textColor;
g.setColor(TQColorGroup::Base, rowBackgroundColor(row));
@@ -452,7 +452,7 @@ void kMyMoneySplitTable::contentsMouseDoubleClickEvent( TQMouseEvent *e )
break;
case 2:
- editWidget = dynamic_cast (m_editAmount->tqfocusWidget());
+ editWidget = dynamic_cast (m_editAmount->focusWidget());
break;
default:
@@ -493,7 +493,7 @@ void kMyMoneySplitTable::setNumRows(int irows)
#if 0
// recalculate row height hint
KMyMoneyCategory cat;
- height = TQMAX(cat.tqsizeHint().height(), height);
+ height = TQMAX(cat.sizeHint().height(), height);
#endif
verticalHeader()->setUpdatesEnabled(false);
@@ -568,7 +568,7 @@ void kMyMoneySplitTable::slotUpdateData(const MyMoneyTransaction& t)
unsigned width = fontMetrics().width(amountTxt);
valfield->setMinimumWidth(width);
- width = valfield->tqminimumSizeHint().width();
+ width = valfield->minimumSizeHint().width();
if(width > m_amountWidth)
m_amountWidth = width;
@@ -969,7 +969,7 @@ bool kMyMoneySplitTable::focusNextPrevChild(bool next)
TQWidget *w = 0;
TQWidget *currentWidget;
- m_tabOrderWidgets.find(tqApp->tqfocusWidget());
+ m_tabOrderWidgets.find(tqApp->focusWidget());
currentWidget = m_tabOrderWidgets.current();
w = next ? m_tabOrderWidgets.next() : m_tabOrderWidgets.prev();
diff --git a/kmymoney2/dialogs/knewaccountdlg.cpp b/kmymoney2/dialogs/knewaccountdlg.cpp
index 2f2748b..c1b8f57 100644
--- a/kmymoney2/dialogs/knewaccountdlg.cpp
+++ b/kmymoney2/dialogs/knewaccountdlg.cpp
@@ -289,7 +289,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo
}
if(!m_account.openingDate().isValid())
- m_account.setOpeningDate(TQDate::tqcurrentDate());
+ m_account.setOpeningDate(TQDate::currentDate());
startDateEdit->setDate(m_account.openingDate());
accountNoEdit->setText(account.number());
diff --git a/kmymoney2/dialogs/knewaccountdlg.h b/kmymoney2/dialogs/knewaccountdlg.h
index 807af7e..013fa3c 100644
--- a/kmymoney2/dialogs/knewaccountdlg.h
+++ b/kmymoney2/dialogs/knewaccountdlg.h
@@ -118,7 +118,7 @@ public:
protected:
void resizeEvent(TQResizeEvent* e);
- void displayOnlineBankingtqStatus(void);
+ void displayOnlineBankingStatus(void);
void adjustEditWidgets(kMyMoneyEdit* dst, kMyMoneyEdit* src, char mode, int corr);
protected slots:
diff --git a/kmymoney2/dialogs/knewaccountdlgdecl.ui b/kmymoney2/dialogs/knewaccountdlgdecl.ui
index 5f42ead..e13989b 100644
--- a/kmymoney2/dialogs/knewaccountdlgdecl.ui
+++ b/kmymoney2/dialogs/knewaccountdlgdecl.ui
@@ -49,13 +49,13 @@
TextLabel1
-
+
60
0
-
+
60
32767
@@ -136,7 +136,7 @@
TextLabel1_2
-
+
0
0
@@ -214,7 +214,7 @@
Expanding
-
+
140
20
@@ -235,13 +235,13 @@
TextLabel5
-
+
0
0
-
+
32767
32767
@@ -333,7 +333,7 @@
Expanding
-
+
20
16
@@ -418,13 +418,13 @@
TextLabel2_2
-
+
60
0
-
+
60
32767
@@ -477,7 +477,7 @@