diff options
Diffstat (limited to 'kmymoney2/dialogs')
170 files changed, 4513 insertions, 4424 deletions
diff --git a/kmymoney2/dialogs/investactivities.cpp b/kmymoney2/dialogs/investactivities.cpp index d929c38..be0f6d1 100644 --- a/kmymoney2/dialogs/investactivities.cpp +++ b/kmymoney2/dialogs/investactivities.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlabel.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -39,12 +39,12 @@ using namespace Invest; using namespace KMyMoneyRegister; -bool Activity::isComplete(QString& reason) const +bool Activity::isComplete(TQString& reason) const { bool rc = false; KMyMoneySecurity* security = dynamic_cast<KMyMoneySecurity*>(haveWidget("security")); if(!security->currentText().isEmpty()) { - rc = security->selector()->contains(security->currentText()); + rc = security->selector()->tqcontains(security->currentText()); } return rc; } @@ -58,12 +58,12 @@ bool Activity::haveAssetAccount(void) const rc = !cat->currentText().isEmpty(); if(rc && !cat->currentText().isEmpty()) { - rc = cat->selector()->contains(cat->currentText()); + rc = cat->selector()->tqcontains(cat->currentText()); } return rc; } -bool Activity::haveCategoryAndAmount(const QString& category, const QString& amount, bool optional) const +bool Activity::haveCategoryAndAmount(const TQString& category, const TQString& amount, bool optional) const { KMyMoneyCategory* cat = dynamic_cast<KMyMoneyCategory*>(haveWidget(category)); @@ -72,7 +72,7 @@ bool Activity::haveCategoryAndAmount(const QString& category, const QString& amo rc = !cat->currentText().isEmpty(); if(rc && !cat->currentText().isEmpty()) { - rc = cat->selector()->contains(cat->currentText()) || cat->isSplitTransaction(); + rc = cat->selector()->tqcontains(cat->currentText()) || cat->isSplitTransaction(); if(rc && !amount.isEmpty()) { MyMoneyMoney value = dynamic_cast<kMyMoneyEdit*>(haveWidget(amount))->value(); if(!isMultiSelection()) @@ -100,14 +100,14 @@ bool Activity::havePrice(void) const return !amount->value().isZero(); } -bool Activity::createCategorySplits(const MyMoneyTransaction& t, KMyMoneyCategory* cat, kMyMoneyEdit* amount, MyMoneyMoney factor, QValueList<MyMoneySplit>&splits, const QValueList<MyMoneySplit>& osplits ) const +bool Activity::createCategorySplits(const MyMoneyTransaction& t, KMyMoneyCategory* cat, kMyMoneyEdit* amount, MyMoneyMoney factor, TQValueList<MyMoneySplit>&splits, const TQValueList<MyMoneySplit>& osplits ) const { bool rc = true; if(!isMultiSelection() || (isMultiSelection() && !cat->currentText().isEmpty())) { if(!cat->isSplitTransaction()) { splits.clear(); MyMoneySplit s1; - QString categoryId; + TQString categoryId; categoryId = cat->selectedItem(); if(!categoryId.isEmpty()) { s1.setAccountId(categoryId); @@ -128,18 +128,18 @@ void Activity::createAssetAccountSplit(MyMoneySplit& split, const MyMoneySplit& { KMyMoneyCategory* cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("asset-account")); if(!isMultiSelection() || (isMultiSelection() && !cat->currentText().isEmpty())) { - QString categoryId; + TQString categoryId; categoryId = cat->selectedItem(); split.setAccountId(categoryId); } split.setMemo(stockSplit.memo()); } -MyMoneyMoney Activity::sumSplits(const MyMoneySplit& s0, const QValueList<MyMoneySplit>& feeSplits, const QValueList<MyMoneySplit>& interestSplits) const +MyMoneyMoney Activity::sumSplits(const MyMoneySplit& s0, const TQValueList<MyMoneySplit>& feeSplits, const TQValueList<MyMoneySplit>& interestSplits) const { MyMoneyMoney total; total = s0.value(); - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; for(it_s = feeSplits.begin(); it_s != feeSplits.end(); ++it_s) { total += (*it_s).value(); } @@ -149,13 +149,13 @@ MyMoneyMoney Activity::sumSplits(const MyMoneySplit& s0, const QValueList<MyMone return total; } -void Activity::setLabelText(const QString& idx, const QString& txt) const +void Activity::setLabelText(const TQString& idx, const TQString& txt) const { - QLabel* w = dynamic_cast<QLabel*>(haveWidget(idx)); + TQLabel* w = dynamic_cast<TQLabel*>(haveWidget(idx)); if(w) { w->setText(txt); } else { - qDebug("Unknown QLabel named '%s'", idx.data()); + qDebug("Unknown TQLabel named '%s'", idx.data()); } } @@ -165,7 +165,7 @@ void Activity::preloadAssetAccount(void) cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("asset-account")); if(cat->isVisible()) { if(cat->currentText().isEmpty()) { - MyMoneyAccount acc = MyMoneyFile::instance()->accountByName(i18n("%1 (Brokerage)").arg(m_parent->account().name())); + MyMoneyAccount acc = MyMoneyFile::instance()->accountByName(i18n("%1 (Brokerage)").tqarg(m_parent->account().name())); if(!acc.id().isEmpty()) { bool blocked = cat->signalsBlocked(); // block signals, so that the focus does not go crazy @@ -182,13 +182,13 @@ void Buy::showWidgets(void) const { KMyMoneyCategory* cat; cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("fee-account")); - cat->parentWidget()->show(); + cat->tqparentWidget()->show(); cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("interest-account")); - cat->parentWidget()->show(); + cat->tqparentWidget()->show(); kMyMoneyEdit* shareEdit = dynamic_cast<kMyMoneyEdit*>(haveWidget("shares")); shareEdit->show(); shareEdit->setPrecision(MyMoneyMoney::denomToPrec(m_parent->security().smallestAccountFraction())); - cat->parentWidget()->show(); + cat->tqparentWidget()->show(); haveWidget("asset-account")->show(); haveWidget("price")->show(); haveWidget("total")->show(); @@ -201,7 +201,7 @@ void Buy::showWidgets(void) const setLabelText("total-label", i18n("Total")); } -bool Buy::isComplete(QString& reason) const +bool Buy::isComplete(TQString& reason) const { bool rc = Activity::isComplete(reason); rc &= haveAssetAccount(); @@ -213,13 +213,13 @@ bool Buy::isComplete(QString& reason) const return rc; } -bool Buy::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) +bool Buy::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) { Q_UNUSED(m_interestSplits); Q_UNUSED(security); Q_UNUSED(currency); - QString reason; + TQString reason; if(!isComplete(reason)) return false; @@ -271,9 +271,9 @@ void Sell::showWidgets(void) const { KMyMoneyCategory* cat; cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("interest-account")); - cat->parentWidget()->show(); + cat->tqparentWidget()->show(); cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("fee-account")); - cat->parentWidget()->show(); + cat->tqparentWidget()->show(); kMyMoneyEdit* shareEdit = dynamic_cast<kMyMoneyEdit*>(haveWidget("shares")); shareEdit->show(); shareEdit->setPrecision(MyMoneyMoney::denomToPrec(m_parent->security().smallestAccountFraction())); @@ -290,7 +290,7 @@ void Sell::showWidgets(void) const setLabelText("total-label", i18n("Total")); } -bool Sell::isComplete(QString& reason) const +bool Sell::isComplete(TQString& reason) const { bool rc = Activity::isComplete(reason); rc &= haveAssetAccount(); @@ -301,12 +301,12 @@ bool Sell::isComplete(QString& reason) const return rc; } -bool Sell::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) +bool Sell::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) { Q_UNUSED(security); Q_UNUSED(currency); - QString reason; + TQString reason; if(!isComplete(reason)) return false; @@ -360,7 +360,7 @@ void Div::showWidgets(void) const { KMyMoneyCategory* cat; cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("interest-account")); - cat->parentWidget()->show(); + cat->tqparentWidget()->show(); haveWidget("asset-account")->show(); haveWidget("total")->show(); @@ -370,20 +370,20 @@ void Div::showWidgets(void) const setLabelText("total-label", i18n("Total")); } -bool Div::isComplete(QString& reason) const +bool Div::isComplete(TQString& reason) const { bool rc = haveAssetAccount(); rc &= haveInterest(false); return rc; } -bool Div::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) +bool Div::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) { Q_UNUSED(m_feeSplits); Q_UNUSED(security); Q_UNUSED(currency); - QString reason; + TQString reason; if(!isComplete(reason)) return false; @@ -413,9 +413,9 @@ void Reinvest::showWidgets(void) const { KMyMoneyCategory* cat; cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("interest-account")); - cat->parentWidget()->show(); + cat->tqparentWidget()->show(); cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("fee-account")); - cat->parentWidget()->show(); + cat->tqparentWidget()->show(); kMyMoneyEdit* shareEdit = dynamic_cast<kMyMoneyEdit*>(haveWidget("shares")); shareEdit->show(); shareEdit->setPrecision(MyMoneyMoney::denomToPrec(m_parent->security().smallestAccountFraction())); @@ -429,23 +429,23 @@ void Reinvest::showWidgets(void) const setLabelText("total-label", i18n("Total")); } -bool Reinvest::isComplete(QString& reason) const +bool Reinvest::isComplete(TQString& reason) const { bool rc = Activity::isComplete(reason); - rc &= haveCategoryAndAmount("interest-account", QString(), false); + rc &= haveCategoryAndAmount("interest-account", TQString(), false); rc &= haveFees(true); rc &= haveShares(); rc &= havePrice(); return rc; } -bool Reinvest::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) +bool Reinvest::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) { Q_UNUSED(assetAccountSplit); Q_UNUSED(security); Q_UNUSED(currency); - QString reason; + TQString reason; if(!isComplete(reason)) return false; @@ -490,7 +490,7 @@ bool Reinvest::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMone MyMoneySplit& s1 = interestSplits[0]; - MyMoneyMoney total = sumSplits(s0, feeSplits, QValueList<MyMoneySplit>()); + MyMoneyMoney total = sumSplits(s0, feeSplits, TQValueList<MyMoneySplit>()); s1.setValue(-total); if(!m_parent->setupPrice(t, s1)) @@ -508,14 +508,14 @@ void Add::showWidgets(void) const setLabelText("shares-label", i18n("Shares")); } -bool Add::isComplete(QString& reason) const +bool Add::isComplete(TQString& reason) const { bool rc = Activity::isComplete(reason); rc &= haveShares(); return rc; } -bool Add::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) +bool Add::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) { Q_UNUSED(t); Q_UNUSED(assetAccountSplit); @@ -524,7 +524,7 @@ bool Add::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySpli Q_UNUSED(security); Q_UNUSED(currency); - QString reason; + TQString reason; if(!isComplete(reason)) return false; @@ -549,14 +549,14 @@ void Remove::showWidgets(void) const setLabelText("shares-label", i18n("Shares")); } -bool Remove::isComplete(QString& reason) const +bool Remove::isComplete(TQString& reason) const { bool rc = Activity::isComplete(reason); rc &= haveShares(); return rc; } -bool Remove::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) +bool Remove::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) { Q_UNUSED(t); Q_UNUSED(assetAccountSplit); @@ -565,7 +565,7 @@ bool Remove::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneyS Q_UNUSED(security); Q_UNUSED(currency); - QString reason; + TQString reason; if(!isComplete(reason)) return false; @@ -592,14 +592,14 @@ void Split::showWidgets(void) const setLabelText("shares-label", i18n("Ratio 1/")); } -bool Split::isComplete(QString& reason) const +bool Split::isComplete(TQString& reason) const { bool rc = Activity::isComplete(reason); rc &= haveShares(); return rc; } -bool Split::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) +bool Split::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) { Q_UNUSED(t); Q_UNUSED(assetAccountSplit); diff --git a/kmymoney2/dialogs/investactivities.h b/kmymoney2/dialogs/investactivities.h index 91b474d..49a33e3 100644 --- a/kmymoney2/dialogs/investactivities.h +++ b/kmymoney2/dialogs/investactivities.h @@ -37,7 +37,7 @@ class Activity public: virtual MyMoneySplit::investTransactionTypeE type(void) const = 0; virtual void showWidgets(void) const = 0; - virtual bool isComplete(QString& reason) const = 0; + virtual bool isComplete(TQString& reason) const = 0; /** * Create a transaction @p t based on the split @p s0 and the data contained @@ -47,30 +47,30 @@ public: * * @return @p true if creation was successful, @p false otherwise */ - virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) = 0; + virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency) = 0; virtual void preloadAssetAccount(void); virtual ~Activity() {} protected: Activity(InvestTransactionEditor* editor) { m_parent = editor; } - QWidget* haveWidget(const QString& name) const { return m_parent->haveWidget(name); } + TQWidget* haveWidget(const TQString& name) const { return m_parent->haveWidget(name); } bool haveAssetAccount(void) const; bool haveFees(bool optional = false) const { return haveCategoryAndAmount("fee-account", "fee-amount", optional); } bool haveInterest(bool optional = false) const { return haveCategoryAndAmount("interest-account", "interest-amount", optional); } bool haveShares(void) const; bool havePrice(void) const; bool isMultiSelection(void) const { return m_parent->isMultiSelection(); } - bool createCategorySplits(const MyMoneyTransaction& t, KMyMoneyCategory* cat, kMyMoneyEdit* amount, MyMoneyMoney factor, QValueList<MyMoneySplit>&splits, const QValueList<MyMoneySplit>& osplits ) const; + bool createCategorySplits(const MyMoneyTransaction& t, KMyMoneyCategory* cat, kMyMoneyEdit* amount, MyMoneyMoney factor, TQValueList<MyMoneySplit>&splits, const TQValueList<MyMoneySplit>& osplits ) const; void createAssetAccountSplit(MyMoneySplit& split, const MyMoneySplit& stockSplit) const; - MyMoneyMoney sumSplits(const MyMoneySplit& s0, const QValueList<MyMoneySplit>& feeSplits, const QValueList<MyMoneySplit>& interestSplits) const; - bool haveCategoryAndAmount(const QString& category, const QString& amount, bool optional) const; - void setLabelText(const QString& idx, const QString& txt) const; + MyMoneyMoney sumSplits(const MyMoneySplit& s0, const TQValueList<MyMoneySplit>& feeSplits, const TQValueList<MyMoneySplit>& interestSplits) const; + bool haveCategoryAndAmount(const TQString& category, const TQString& amount, bool optional) const; + void setLabelText(const TQString& idx, const TQString& txt) const; InvestTransactionEditor::priceModeE priceMode(void) const { return m_parent->priceMode(); } protected: InvestTransactionEditor* m_parent; - QMap<QString, MyMoneyMoney> m_priceInfo; + TQMap<TQString, MyMoneyMoney> m_priceInfo; }; class Buy : public Activity @@ -80,8 +80,8 @@ public: virtual ~Buy() {} virtual MyMoneySplit::investTransactionTypeE type(void) const { return MyMoneySplit::BuyShares; } virtual void showWidgets(void) const; - virtual bool isComplete(QString& reason) const; - virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); + virtual bool isComplete(TQString& reason) const; + virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); }; class Sell : public Activity @@ -91,8 +91,8 @@ public: virtual ~Sell() {} virtual MyMoneySplit::investTransactionTypeE type(void) const { return MyMoneySplit::SellShares; } virtual void showWidgets(void) const; - virtual bool isComplete(QString& reason) const; - virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); + virtual bool isComplete(TQString& reason) const; + virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); }; class Div : public Activity @@ -102,8 +102,8 @@ public: virtual ~Div() {} virtual MyMoneySplit::investTransactionTypeE type(void) const { return MyMoneySplit::Dividend; } virtual void showWidgets(void) const; - virtual bool isComplete(QString& reason) const; - virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); + virtual bool isComplete(TQString& reason) const; + virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); }; class Reinvest : public Activity @@ -113,8 +113,8 @@ public: virtual ~Reinvest() {} virtual MyMoneySplit::investTransactionTypeE type(void) const { return MyMoneySplit::ReinvestDividend; } virtual void showWidgets(void) const; - virtual bool isComplete(QString& reason) const; - virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); + virtual bool isComplete(TQString& reason) const; + virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); }; class Add : public Activity @@ -124,8 +124,8 @@ public: virtual ~Add() {} virtual MyMoneySplit::investTransactionTypeE type(void) const { return MyMoneySplit::AddShares; } virtual void showWidgets(void) const; - virtual bool isComplete(QString& reason) const; - virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); + virtual bool isComplete(TQString& reason) const; + virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); }; class Remove : public Activity @@ -135,8 +135,8 @@ public: virtual ~Remove() {} virtual MyMoneySplit::investTransactionTypeE type(void) const { return MyMoneySplit::RemoveShares; } virtual void showWidgets(void) const; - virtual bool isComplete(QString& reason) const; - virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); + virtual bool isComplete(TQString& reason) const; + virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); }; class Split : public Activity @@ -146,8 +146,8 @@ public: virtual ~Split() {} virtual MyMoneySplit::investTransactionTypeE type(void) const { return MyMoneySplit::SplitShares; } virtual void showWidgets(void) const; - virtual bool isComplete(QString& reason) const; - virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& m_feeSplits, QValueList<MyMoneySplit>& interestSplits, QValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); + virtual bool isComplete(TQString& reason) const; + virtual bool createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& m_feeSplits, TQValueList<MyMoneySplit>& interestSplits, TQValueList<MyMoneySplit>& m_interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency); }; } // namespace Invest diff --git a/kmymoney2/dialogs/investtransactioneditor.cpp b/kmymoney2/dialogs/investtransactioneditor.cpp index 5a62436..d235ae5 100644 --- a/kmymoney2/dialogs/investtransactioneditor.cpp +++ b/kmymoney2/dialogs/investtransactioneditor.cpp @@ -20,11 +20,11 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlabel.h> -#include <qapplication.h> -#include <qeventloop.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> +#include <tqlabel.h> +#include <tqapplication.h> +#include <tqeventloop.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -64,8 +64,8 @@ class InvestTransactionEditor::Private { friend class Invest::Activity; public: - Private(InvestTransactionEditor* parent) : - m_parent(parent), + Private(InvestTransactionEditor* tqparent) : + m_parent(tqparent), m_activity(0) { m_phonyAccount = MyMoneyAccount("Phony-ID", MyMoneyAccount()); @@ -75,7 +75,7 @@ public: delete m_activity; } - QWidget* haveWidget(const QString& name) { return m_parent->haveWidget(name); } + TQWidget* haveWidget(const TQString& name) { return m_parent->haveWidget(name); } InvestTransactionEditor* m_parent; Activity* m_activity; @@ -94,7 +94,7 @@ InvestTransactionEditor::~InvestTransactionEditor() delete d; } -InvestTransactionEditor::InvestTransactionEditor(TransactionEditorContainer* regForm, KMyMoneyRegister::InvestTransaction* item, const KMyMoneyRegister::SelectedTransactions& list, const QDate& lastPostDate) : +InvestTransactionEditor::InvestTransactionEditor(TransactionEditorContainer* regForm, KMyMoneyRegister::InvestTransaction* item, const KMyMoneyRegister::SelectedTransactions& list, const TQDate& lastPostDate) : TransactionEditor(regForm, item, list, lastPostDate), d(new Private(this)) { @@ -143,14 +143,14 @@ void InvestTransactionEditor::activityFactory(MyMoneySplit::investTransactionTyp } } -void InvestTransactionEditor::dissectTransaction(const MyMoneyTransaction& transaction, const MyMoneySplit& split, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency, MyMoneySplit::investTransactionTypeE& transactionType) +void InvestTransactionEditor::dissectTransaction(const MyMoneyTransaction& transaction, const MyMoneySplit& split, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency, MyMoneySplit::investTransactionTypeE& transactionType) { // collect the splits. split references the stock account and should already // be set up. assetAccountSplit references the corresponding asset account (maybe // empty), feeSplits is the list of all expenses and interestSplits // the list of all incomes MyMoneyFile* file = MyMoneyFile::instance(); - QValueList<MyMoneySplit>::ConstIterator it_s; + TQValueList<MyMoneySplit>::ConstIterator it_s; for(it_s = transaction.splits().begin(); it_s != transaction.splits().end(); ++it_s) { MyMoneyAccount acc = file->account((*it_s).accountId()); if((*it_s).id() == split.id()) { @@ -194,45 +194,45 @@ void InvestTransactionEditor::createEditWidgets(void) { KMyMoneyActivityCombo* activity = new KMyMoneyActivityCombo(); m_editWidgets["activity"] = activity; - connect(activity, SIGNAL(activitySelected(MyMoneySplit::investTransactionTypeE)), this, SLOT(slotUpdateActivity(MyMoneySplit::investTransactionTypeE))); - connect(activity, SIGNAL(activitySelected(MyMoneySplit::investTransactionTypeE)), this, SLOT(slotUpdateButtonState())); + connect(activity, TQT_SIGNAL(activitySelected(MyMoneySplit::investTransactionTypeE)), this, TQT_SLOT(slotUpdateActivity(MyMoneySplit::investTransactionTypeE))); + connect(activity, TQT_SIGNAL(activitySelected(MyMoneySplit::investTransactionTypeE)), this, TQT_SLOT(slotUpdateButtonState())); m_editWidgets["postdate"] = new kMyMoneyDateInput; - connect(m_editWidgets["postdate"], SIGNAL(dateChanged(const QDate&)), this, SLOT(slotUpdateButtonState())); + connect(m_editWidgets["postdate"], TQT_SIGNAL(dateChanged(const TQDate&)), this, TQT_SLOT(slotUpdateButtonState())); KMyMoneySecurity* security = new KMyMoneySecurity; security->setHint(i18n("Security")); m_editWidgets["security"] = security; - connect(security, SIGNAL(itemSelected(const QString&)), this, SLOT(slotUpdateSecurity(const QString&))); - connect(security, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); - connect(security, SIGNAL(createItem(const QString&, QString&)), this, SLOT(slotCreateSecurity(const QString&, QString&))); - connect(security, SIGNAL(objectCreation(bool)), this, SIGNAL(objectCreation(bool))); + connect(security, TQT_SIGNAL(itemSelected(const TQString&)), this, TQT_SLOT(slotUpdateSecurity(const TQString&))); + connect(security, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); + connect(security, TQT_SIGNAL(createItem(const TQString&, TQString&)), this, TQT_SLOT(slotCreateSecurity(const TQString&, TQString&))); + connect(security, TQT_SIGNAL(objectCreation(bool)), this, TQT_SIGNAL(objectCreation(bool))); KMyMoneyCategory* asset = new KMyMoneyCategory(0, 0, false); asset->setHint(i18n("Asset account")); m_editWidgets["asset-account"] = asset; - connect(asset, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); - connect(asset, SIGNAL(objectCreation(bool)), this, SIGNAL(objectCreation(bool))); + connect(asset, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); + connect(asset, TQT_SIGNAL(objectCreation(bool)), this, TQT_SIGNAL(objectCreation(bool))); KMyMoneyCategory* fees = new KMyMoneyCategory(0, 0, true); fees->setHint(i18n("Fees")); m_editWidgets["fee-account"] = fees; - connect(fees, SIGNAL(itemSelected(const QString&)), this, SLOT(slotUpdateFeeCategory(const QString&))); - connect(fees, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); - connect(fees, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateFeeVisibility(const QString&))); - connect(fees, SIGNAL(createItem(const QString&, QString&)), this, SLOT(slotCreateFeeCategory(const QString&, QString&))); - connect(fees, SIGNAL(objectCreation(bool)), this, SIGNAL(objectCreation(bool))); - connect(fees->splitButton(), SIGNAL(clicked()), this, SLOT(slotEditFeeSplits())); + connect(fees, TQT_SIGNAL(itemSelected(const TQString&)), this, TQT_SLOT(slotUpdateFeeCategory(const TQString&))); + connect(fees, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); + connect(fees, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateFeeVisibility(const TQString&))); + connect(fees, TQT_SIGNAL(createItem(const TQString&, TQString&)), this, TQT_SLOT(slotCreateFeeCategory(const TQString&, TQString&))); + connect(fees, TQT_SIGNAL(objectCreation(bool)), this, TQT_SIGNAL(objectCreation(bool))); + connect(fees->splitButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditFeeSplits())); KMyMoneyCategory* interest = new KMyMoneyCategory(0, 0, true); interest->setHint(i18n("Interest")); m_editWidgets["interest-account"] = interest; - connect(interest, SIGNAL(itemSelected(const QString&)), this, SLOT(slotUpdateInterestCategory(const QString&))); - connect(interest, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); - connect(interest, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateInterestVisibility(const QString&))); - connect(interest, SIGNAL(createItem(const QString&, QString&)), this, SLOT(slotCreateInterestCategory(const QString&, QString&))); - connect(interest, SIGNAL(objectCreation(bool)), this, SIGNAL(objectCreation(bool))); - connect(interest->splitButton(), SIGNAL(clicked()), this, SLOT(slotEditInterestSplits())); + connect(interest, TQT_SIGNAL(itemSelected(const TQString&)), this, TQT_SLOT(slotUpdateInterestCategory(const TQString&))); + connect(interest, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); + connect(interest, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateInterestVisibility(const TQString&))); + connect(interest, TQT_SIGNAL(createItem(const TQString&, TQString&)), this, TQT_SLOT(slotCreateInterestCategory(const TQString&, TQString&))); + connect(interest, TQT_SIGNAL(objectCreation(bool)), this, TQT_SIGNAL(objectCreation(bool))); + connect(interest->splitButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditInterestSplits())); KTextEdit* memo = new KTextEdit; memo->setTabChangesFocus(true); @@ -242,76 +242,76 @@ void InvestTransactionEditor::createEditWidgets(void) value->setHint(i18n("Shares")); value->setResetButtonVisible(false); m_editWidgets["shares"] = value; - connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); - connect(value, SIGNAL(valueChanged(const QString&)), this, SLOT(slotUpdateTotalAmount())); + connect(value, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); + connect(value, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotUpdateTotalAmount())); value = new kMyMoneyEdit; value->setHint(i18n("Price")); value->setResetButtonVisible(false); value->setPrecision(KMyMoneyGlobalSettings::pricePrecision()); m_editWidgets["price"] = value; - connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); - connect(value, SIGNAL(valueChanged(const QString&)), this, SLOT(slotUpdateTotalAmount())); + connect(value, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); + connect(value, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotUpdateTotalAmount())); value = new kMyMoneyEdit; // TODO once we have the selected transactions as array of Transaction // we can allow multiple splits for fee and interest value->setResetButtonVisible(false); m_editWidgets["fee-amount"] = value; - connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); - connect(value, SIGNAL(valueChanged(const QString&)), this, SLOT(slotUpdateTotalAmount())); + connect(value, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); + connect(value, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotUpdateTotalAmount())); value = new kMyMoneyEdit; // TODO once we have the selected transactions as array of Transaction // we can allow multiple splits for fee and interest value->setResetButtonVisible(false); m_editWidgets["interest-amount"] = value; - connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); - connect(value, SIGNAL(valueChanged(const QString&)), this, SLOT(slotUpdateTotalAmount())); + connect(value, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); + connect(value, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotUpdateTotalAmount())); KMyMoneyReconcileCombo* reconcile = new KMyMoneyReconcileCombo; m_editWidgets["status"] = reconcile; - connect(reconcile, SIGNAL(itemSelected(const QString&)), this, SLOT(slotUpdateButtonState())); + connect(reconcile, TQT_SIGNAL(itemSelected(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); - KMyMoneyRegister::QWidgetContainer::iterator it_w; + KMyMoneyRegister::TQWidgetContainer::iterator it_w; for(it_w = m_editWidgets.begin(); it_w != m_editWidgets.end(); ++it_w) { (*it_w)->installEventFilter(this); } - QLabel* label = new QLabel("", 0); - label->setAlignment(Qt::AlignVCenter | Qt::AlignRight | Qt::DontClip); + TQLabel* label = new TQLabel("", 0); + label->tqsetAlignment(TQt::AlignVCenter | TQt::AlignRight | TQt::DontClip); m_editWidgets["total"] = label; - label = new QLabel("", 0); - label->setAlignment(Qt::AlignVCenter | Qt::DontClip); + label = new TQLabel("", 0); + label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["total-label"] = label; - label = new QLabel("", 0); - label->setAlignment(Qt::AlignVCenter | Qt::DontClip); + label = new TQLabel("", 0); + label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["asset-label"] = label; - label = new QLabel("", 0); - label->setAlignment(Qt::AlignVCenter | Qt::DontClip); + label = new TQLabel("", 0); + label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["fee-label"] = label; - label = new QLabel("", 0); - label->setAlignment(Qt::AlignVCenter | Qt::DontClip); + label = new TQLabel("", 0); + label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["fee-amount-label"] = label; - label = new QLabel("", 0); - label->setAlignment(Qt::AlignVCenter | Qt::DontClip); + label = new TQLabel("", 0); + label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["interest-label"] = label; - label = new QLabel("", 0); - label->setAlignment(Qt::AlignVCenter | Qt::DontClip); + label = new TQLabel("", 0); + label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["interest-amount-label"] = label; - label = new QLabel("", 0); - label->setAlignment(Qt::AlignVCenter | Qt::DontClip); + label = new TQLabel("", 0); + label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["price-label"] = label; - label = new QLabel("", 0); - label->setAlignment(Qt::AlignVCenter | Qt::DontClip); + label = new TQLabel("", 0); + label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["shares-label"] = label; // if we don't have more than 1 selected transaction, we don't need @@ -323,17 +323,17 @@ void InvestTransactionEditor::createEditWidgets(void) int InvestTransactionEditor::slotEditFeeSplits(void) { - return editSplits("fee-account", "fee-amount", m_feeSplits, false, SLOT(slotEditFeeSplits())); + return editSplits("fee-account", "fee-amount", m_feeSplits, false, TQT_SLOT(slotEditFeeSplits())); } int InvestTransactionEditor::slotEditInterestSplits(void) { - return editSplits("interest-account", "interest-amount", m_interestSplits, true, SLOT(slotEditInterestSplits())); + return editSplits("interest-account", "interest-amount", m_interestSplits, true, TQT_SLOT(slotEditInterestSplits())); } -int InvestTransactionEditor::editSplits(const QString& categoryWidgetName, const QString& amountWidgetName, QValueList<MyMoneySplit>& splits, bool isIncome, const char* slotEditSplits) +int InvestTransactionEditor::editSplits(const TQString& categoryWidgetName, const TQString& amountWidgetName, TQValueList<MyMoneySplit>& splits, bool isIncome, const char* slotEditSplits) { - int rc = QDialog::Rejected; + int rc = TQDialog::Rejected; if(!m_openEditSplits) { // only get in here in a single instance @@ -341,7 +341,7 @@ int InvestTransactionEditor::editSplits(const QString& categoryWidgetName, const // force focus change to update all data KMyMoneyCategory* category = dynamic_cast<KMyMoneyCategory*>(m_editWidgets[categoryWidgetName]); - QWidget* w = category->splitButton(); + TQWidget* w = category->splitButton(); if(w) w->setFocus(); @@ -377,13 +377,13 @@ int InvestTransactionEditor::editSplits(const QString& categoryWidgetName, const 0, m_priceInfo, m_regForm); - // connect(dlg, SIGNAL(newCategory(MyMoneyAccount&)), this, SIGNAL(newCategory(MyMoneyAccount&))); + // connect(dlg, TQT_SIGNAL(newCategory(MyMoneyAccount&)), this, TQT_SIGNAL(newCategory(MyMoneyAccount&))); - if((rc = dlg->exec()) == QDialog::Accepted) { + if((rc = dlg->exec()) == TQDialog::Accepted) { transaction = dlg->transaction(); // collect splits out of the transaction splits.clear(); - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; MyMoneyMoney fees; for(it_s = transaction.splits().begin(); it_s != transaction.splits().end(); ++it_s) { if((*it_s).accountId() == d->m_phonyAccount.id()) @@ -394,7 +394,7 @@ int InvestTransactionEditor::editSplits(const QString& categoryWidgetName, const if(isIncome) fees = -fees; - QString categoryId; + TQString categoryId; setupCategoryWidget(category, splits, categoryId, slotEditSplits); amount->setValue(fees); slotUpdateTotalAmount(); @@ -413,7 +413,7 @@ int InvestTransactionEditor::editSplits(const QString& categoryWidgetName, const return rc; } -bool InvestTransactionEditor::createPseudoTransaction(MyMoneyTransaction& t, const QValueList<MyMoneySplit>& splits) +bool InvestTransactionEditor::createPseudoTransaction(MyMoneyTransaction& t, const TQValueList<MyMoneySplit>& splits) { t.removeSplits(); @@ -424,7 +424,7 @@ bool InvestTransactionEditor::createPseudoTransaction(MyMoneyTransaction& t, con t.addSplit(split); d->m_phonySplit = split; - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; for(it_s = splits.begin(); it_s != splits.end(); ++it_s) { split = *it_s; split.clearId(); @@ -433,10 +433,10 @@ bool InvestTransactionEditor::createPseudoTransaction(MyMoneyTransaction& t, con return true; } -void InvestTransactionEditor::slotCreateSecurity(const QString& name, QString& id) +void InvestTransactionEditor::slotCreateSecurity(const TQString& name, TQString& id) { MyMoneyAccount acc; - QRegExp exp("([^:]+)"); + TQRegExp exp("([^:]+)"); if(exp.search(name) != -1) { acc.setName(exp.cap(1)); @@ -451,7 +451,7 @@ void InvestTransactionEditor::slotCreateSecurity(const QString& name, QString& i } } -void InvestTransactionEditor::slotCreateFeeCategory(const QString& name, QString& id) +void InvestTransactionEditor::slotCreateFeeCategory(const TQString& name, TQString& id) { MyMoneyAccount acc; acc.setName(name); @@ -462,28 +462,28 @@ void InvestTransactionEditor::slotCreateFeeCategory(const QString& name, QString id = acc.id(); } -void InvestTransactionEditor::slotUpdateFeeCategory(const QString& id) +void InvestTransactionEditor::slotUpdateFeeCategory(const TQString& id) { haveWidget("fee-amount")->setDisabled(id.isEmpty()); } -void InvestTransactionEditor::slotUpdateFeeVisibility(const QString& txt) +void InvestTransactionEditor::slotUpdateFeeVisibility(const TQString& txt) { haveWidget("fee-amount")->setHidden(txt.isEmpty()); - QWidget* w = haveWidget("fee-amount-label"); + TQWidget* w = haveWidget("fee-amount-label"); if(w) w->setShown(haveWidget("fee-amount")->isVisible()); } -void InvestTransactionEditor::slotUpdateInterestCategory(const QString& id) +void InvestTransactionEditor::slotUpdateInterestCategory(const TQString& id) { haveWidget("interest-amount")->setDisabled(id.isEmpty()); } -void InvestTransactionEditor::slotUpdateInterestVisibility(const QString& txt) +void InvestTransactionEditor::slotUpdateInterestVisibility(const TQString& txt) { KMyMoneyCategory* interest = dynamic_cast<KMyMoneyCategory*>(haveWidget("interest-account")); - QWidget* w = haveWidget("interest-amount-label"); + TQWidget* w = haveWidget("interest-amount-label"); if(dynamic_cast<Reinvest*>(d->m_activity)) { interest->splitButton()->hide(); @@ -501,7 +501,7 @@ void InvestTransactionEditor::slotUpdateInterestVisibility(const QString& txt) w->setShown(haveWidget("interest-amount")->isVisible()); } -void InvestTransactionEditor::slotCreateInterestCategory(const QString& name, QString& id) +void InvestTransactionEditor::slotCreateInterestCategory(const TQString& name, TQString& id) { MyMoneyAccount acc; acc.setName(name); @@ -519,19 +519,19 @@ void InvestTransactionEditor::slotReloadEditWidgets(void) KMyMoneySecurity* security = dynamic_cast<KMyMoneySecurity*>(haveWidget("security")); AccountSet aSet; - QString id; + TQString id; // interest-account aSet.clear(); aSet.addAccountGroup(MyMoneyAccount::Income); aSet.load(interest->selector()); - setupCategoryWidget(interest, m_interestSplits, id, SLOT(slotEditInterestSplits())); + setupCategoryWidget(interest, m_interestSplits, id, TQT_SLOT(slotEditInterestSplits())); // fee-account aSet.clear(); aSet.addAccountGroup(MyMoneyAccount::Expense); aSet.load(fees->selector()); - setupCategoryWidget(fees, m_feeSplits, id, SLOT(slotEditFeeSplits())); + setupCategoryWidget(fees, m_feeSplits, id, TQT_SLOT(slotEditFeeSplits())); // security aSet.clear(); @@ -540,7 +540,7 @@ void InvestTransactionEditor::slotReloadEditWidgets(void) void InvestTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action /* action */) { - QString id; + TQString id; kMyMoneyDateInput* postDate = dynamic_cast<kMyMoneyDateInput*>(haveWidget("postdate")); KMyMoneyReconcileCombo* reconcile = dynamic_cast<KMyMoneyReconcileCombo*>(haveWidget("status")); @@ -554,7 +554,7 @@ void InvestTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action /* action // check if the current transaction has a reference to an equity account bool haveEquityAccount = false; - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; for(it_s = m_transaction.splits().begin(); !haveEquityAccount && it_s != m_transaction.splits().end(); ++it_s) { MyMoneyAccount acc = MyMoneyFile::instance()->account((*it_s).accountId()); if(acc.accountType() == MyMoneyAccount::Equity) @@ -586,7 +586,7 @@ void InvestTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action /* action else if(m_lastPostDate.isValid()) postDate->setDate(m_lastPostDate); else - postDate->setDate(QDate::currentDate()); + postDate->setDate(TQDate::tqcurrentDate()); // security (but only if it's not the investment account) if(m_split.accountId() != m_account.id()) { @@ -605,14 +605,14 @@ void InvestTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action /* action aSet.clear(); aSet.addAccountGroup(MyMoneyAccount::Income); aSet.load(interest->selector()); - setupCategoryWidget(interest, m_interestSplits, id, SLOT(slotEditInterestSplits())); + setupCategoryWidget(interest, m_interestSplits, id, TQT_SLOT(slotEditInterestSplits())); slotUpdateInterestVisibility(interest->currentText()); // fee-account aSet.clear(); aSet.addAccountGroup(MyMoneyAccount::Expense); aSet.load(fees->selector()); - setupCategoryWidget(fees, m_feeSplits, id, SLOT(slotEditFeeSplits())); + setupCategoryWidget(fees, m_feeSplits, id, TQT_SLOT(slotEditFeeSplits())); slotUpdateFeeVisibility(fees->currentText()); // memo @@ -650,9 +650,9 @@ void InvestTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action /* action reconcile->setState(m_split.reconcileFlag()); } else { - postDate->loadDate(QDate()); + postDate->loadDate(TQDate()); reconcile->setState(MyMoneySplit::Unknown); - memo->setText(QString()); + memo->setText(TQString()); // We don't allow to change the activity activity->setActivity(d->m_activity->type()); @@ -662,16 +662,16 @@ void InvestTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action /* action // scan the list of selected transactions and check that they have // the same activity. KMyMoneyRegister::SelectedTransactions::iterator it_t = m_transactions.begin(); - const QString& action = m_item->split().action(); + const TQString& action = m_item->split().action(); bool isNegative = m_item->split().shares().isNegative(); bool allSameActivity = true; for(it_t = m_transactions.begin(); allSameActivity && (it_t != m_transactions.end()); ++it_t) { allSameActivity = (action == (*it_t).split().action() && (*it_t).split().shares().isNegative() == isNegative); } - QStringList fields; + TQStringList fields; fields << "shares" << "price" << "fee-amount" << "interest-amount"; - QStringList::const_iterator it_f; + TQStringList::const_iterator it_f; for(it_f = fields.begin(); it_f != fields.end(); ++it_f) { value = dynamic_cast<kMyMoneyEdit*>(haveWidget((*it_f))); value->setText(""); @@ -681,7 +681,7 @@ void InvestTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action /* action // if we have transactions with different activities, disable some more widgets if(!allSameActivity) { fields << "asset-account" << "fee-account" << "interest-account"; - QStringList::const_iterator it_f; + TQStringList::const_iterator it_f; for(it_f = fields.begin(); it_f != fields.end(); ++it_f) { haveWidget(*it_f)->setDisabled(true); } @@ -689,21 +689,21 @@ void InvestTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action /* action } } -QWidget* InvestTransactionEditor::firstWidget(void) const +TQWidget* InvestTransactionEditor::firstWidget(void) const { return 0; // let the creator use the first widget in the tab order } -bool InvestTransactionEditor::isComplete(QString& reason) const +bool InvestTransactionEditor::isComplete(TQString& reason) const { - reason = QString(); - // reason.clear(); // for Qt4 + reason = TQString(); + // reason.clear(); // for TQt4 return d->m_activity->isComplete(reason); } -MyMoneyMoney InvestTransactionEditor::subtotal(const QValueList<MyMoneySplit>& splits) const +MyMoneyMoney InvestTransactionEditor::subtotal(const TQValueList<MyMoneySplit>& splits) const { - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; MyMoneyMoney sum; for(it_s = splits.begin(); it_s != splits.end(); ++it_s) { @@ -713,7 +713,7 @@ MyMoneyMoney InvestTransactionEditor::subtotal(const QValueList<MyMoneySplit>& s return sum; } -void InvestTransactionEditor::slotUpdateSecurity(const QString& stockId) +void InvestTransactionEditor::slotUpdateSecurity(const TQString& stockId) { MyMoneyFile* file = MyMoneyFile::instance(); MyMoneyAccount stock = file->account(stockId); @@ -785,7 +785,7 @@ void InvestTransactionEditor::totalAmount(MyMoneyMoney& amount) const void InvestTransactionEditor::slotUpdateTotalAmount(void) { - QLabel* total = dynamic_cast<QLabel*>(haveWidget("total")); + TQLabel* total = dynamic_cast<TQLabel*>(haveWidget("total")); if(total && total->isVisible()) { MyMoneyMoney amount; @@ -801,19 +801,19 @@ void InvestTransactionEditor::slotUpdateActivity(MyMoneySplit::investTransaction KMyMoneyCategory* cat; - // hide all dynamic widgets (make sure to use the parentWidget for the + // hide all dynamic widgets (make sure to use the tqparentWidget for the // category widgets) - haveWidget("interest-account")->parentWidget()->hide(); - haveWidget("fee-account")->parentWidget()->hide(); + haveWidget("interest-account")->tqparentWidget()->hide(); + haveWidget("fee-account")->tqparentWidget()->hide(); - QStringList dynwidgets; + TQStringList dynwidgets; dynwidgets << "total-label" << "asset-label" << "fee-label" << "fee-amount-label" << "interest-label" << "interest-amount-label" << "price-label" << "shares-label"; // hiding labels works by clearing them. hide() does not do the job - // as the underlying text in the QTable object will shine through - QStringList::const_iterator it_s; + // as the underlying text in the TQTable object will shine through + TQStringList::const_iterator it_s; for(it_s = dynwidgets.begin(); it_s != dynwidgets.end(); ++it_s) { - QLabel* w = dynamic_cast<QLabel*>(haveWidget(*it_s)); + TQLabel* w = dynamic_cast<TQLabel*>(haveWidget(*it_s)); if(w) w->setText(" "); } @@ -823,7 +823,7 @@ void InvestTransactionEditor::slotUpdateActivity(MyMoneySplit::investTransaction dynwidgets << "asset-account" << "interest-amount" << "fee-amount" << "shares" << "price" << "total"; for(it_s = dynwidgets.begin(); it_s != dynwidgets.end(); ++it_s) { - QWidget* w = haveWidget(*it_s); + TQWidget* w = haveWidget(*it_s); if(w) w->hide(); } @@ -833,11 +833,11 @@ void InvestTransactionEditor::slotUpdateActivity(MyMoneySplit::investTransaction d->m_activity->preloadAssetAccount(); cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("interest-account")); - if(cat->parentWidget()->isVisible()) + if(cat->tqparentWidget()->isVisible()) slotUpdateInterestVisibility(cat->currentText()); cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("fee-account")); - if(cat->parentWidget()->isVisible()) + if(cat->tqparentWidget()->isVisible()) slotUpdateFeeVisibility(cat->currentText()); } @@ -845,7 +845,7 @@ InvestTransactionEditor::priceModeE InvestTransactionEditor::priceMode(void) con { priceModeE mode = static_cast<priceModeE>(0); KMyMoneySecurity* sec = dynamic_cast<KMyMoneySecurity*>(m_editWidgets["security"]); - QString accId; + TQString accId; if(!sec->currentText().isEmpty()) { accId = sec->selectedItem(); if(accId.isEmpty()) @@ -854,7 +854,7 @@ InvestTransactionEditor::priceModeE InvestTransactionEditor::priceMode(void) con while(!accId.isEmpty() && mode == 0) { MyMoneyAccount acc = MyMoneyFile::instance()->account(accId); if(acc.value("priceMode").isEmpty()) - accId = acc.parentAccountId(); + accId = acc.tqparentAccountId(); else mode = static_cast<priceModeE>(acc.value("priceMode").toInt()); } @@ -873,9 +873,9 @@ bool InvestTransactionEditor::setupPrice(const MyMoneyTransaction& t, MyMoneySpl int fract = acc.fraction(); if(acc.currencyId() != t.commodity()) { - QMap<QString, MyMoneyMoney>::Iterator it_p; - QString key = t.commodity() + "-" + acc.currencyId(); - it_p = m_priceInfo.find(key); + TQMap<TQString, MyMoneyMoney>::Iterator it_p; + TQString key = t.commodity() + "-" + acc.currencyId(); + it_p = m_priceInfo.tqfind(key); // if it's not found, then collect it from the user first MyMoneyMoney price; @@ -895,7 +895,7 @@ bool InvestTransactionEditor::setupPrice(const MyMoneyTransaction& t, MyMoneySpl fract, m_regForm, "currencyCalculator"); - if(calc.exec() == QDialog::Rejected) { + if(calc.exec() == TQDialog::Rejected) { return false; } price = calc.price(); @@ -924,11 +924,11 @@ bool InvestTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyM KMyMoneySecurity* sec = dynamic_cast<KMyMoneySecurity*>(m_editWidgets["security"]); if(!isMultiSelection() || (isMultiSelection() && !sec->currentText().isEmpty())) { - QString securityId = sec->selectedItem(); + TQString securityId = sec->selectedItem(); if(!securityId.isEmpty()) { s0.setAccountId(securityId); MyMoneyAccount stockAccount = file->account(securityId); - QString currencyId = stockAccount.currencyId(); + TQString currencyId = stockAccount.currencyId(); MyMoneySecurity security = file->security(currencyId); t.setCommodity(security.tradingCurrency()); @@ -940,7 +940,7 @@ bool InvestTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyM // extract price info from original transaction m_priceInfo.clear(); - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; if(!torig.id().isEmpty()) { for(it_s = torig.splits().begin(); it_s != torig.splits().end(); ++it_s) { if((*it_s).id() != sorig.id()) { @@ -973,8 +973,8 @@ bool InvestTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyM } MyMoneySplit assetAccountSplit; - QValueList<MyMoneySplit> feeSplits; - QValueList<MyMoneySplit> interestSplits; + TQValueList<MyMoneySplit> feeSplits; + TQValueList<MyMoneySplit> interestSplits; MyMoneySecurity security, currency; MyMoneySplit::investTransactionTypeE transactionType; @@ -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(QDate::currentDate()); + s0.setReconcileDate(TQDate::tqcurrentDate()); // 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); @@ -1032,7 +1032,7 @@ bool InvestTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyM t.addSplit(s0); - QValueList<MyMoneySplit>::iterator it_s; + TQValueList<MyMoneySplit>::iterator it_s; for(it_s = feeSplits.begin(); it_s != feeSplits.end(); ++it_s) { (*it_s).clearId(); t.addSplit(*it_s); @@ -1057,7 +1057,7 @@ bool InvestTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyM void InvestTransactionEditor::updatePriceMode(const MyMoneySplit& split) { - QLabel* label = dynamic_cast<QLabel*>(haveWidget("price-label")); + TQLabel* label = dynamic_cast<TQLabel*>(haveWidget("price-label")); if(label) { kMyMoneyEdit* sharesEdit = dynamic_cast<kMyMoneyEdit*>(haveWidget("shares")); kMyMoneyEdit* priceEdit = dynamic_cast<kMyMoneyEdit*>(haveWidget("price")); diff --git a/kmymoney2/dialogs/investtransactioneditor.h b/kmymoney2/dialogs/investtransactioneditor.h index 4d56697..c943dc3 100644 --- a/kmymoney2/dialogs/investtransactioneditor.h +++ b/kmymoney2/dialogs/investtransactioneditor.h @@ -35,6 +35,7 @@ class InvestTransactionEditor : public TransactionEditor friend class InvestTransactionEditorPrivate; Q_OBJECT + TQ_OBJECT public: typedef enum { PricePerShare = 1, @@ -42,7 +43,7 @@ public: } priceModeE; InvestTransactionEditor(); - InvestTransactionEditor(TransactionEditorContainer* regForm, KMyMoneyRegister::InvestTransaction* item, const KMyMoneyRegister::SelectedTransactions& list, const QDate& lastPostDate); + InvestTransactionEditor(TransactionEditorContainer* regForm, KMyMoneyRegister::InvestTransaction* item, const KMyMoneyRegister::SelectedTransactions& list, const TQDate& lastPostDate); virtual ~InvestTransactionEditor(); /** @@ -60,15 +61,15 @@ public: * * @sa transactionDataSufficient() */ - virtual bool isComplete(QString& reason) const; + virtual bool isComplete(TQString& reason) const; - virtual QWidget* firstWidget(void) const; + virtual TQWidget* firstWidget(void) const; virtual bool fixTransactionCommodity(const MyMoneyAccount& /* account */) { return true; } void totalAmount(MyMoneyMoney& amount) const; - static void dissectTransaction(const MyMoneyTransaction& transaction, const MyMoneySplit& split, MyMoneySplit& assetAccountSplit, QValueList<MyMoneySplit>& feeSplits, QValueList<MyMoneySplit>& interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency, MyMoneySplit::investTransactionTypeE& transactionType); + static void dissectTransaction(const MyMoneyTransaction& transaction, const MyMoneySplit& split, MyMoneySplit& assetAccountSplit, TQValueList<MyMoneySplit>& feeSplits, TQValueList<MyMoneySplit>& interestSplits, MyMoneySecurity& security, MyMoneySecurity& currency, MyMoneySplit::investTransactionTypeE& transactionType); bool setupPrice(const MyMoneyTransaction& t, MyMoneySplit& split); @@ -98,20 +99,20 @@ public: const MyMoneySecurity& security(void) const { return m_security; } protected slots: - void slotCreateSecurity(const QString& name, QString& id); - void slotCreateFeeCategory(const QString& name, QString& id); - void slotCreateInterestCategory(const QString& name, QString& id); + void slotCreateSecurity(const TQString& name, TQString& id); + void slotCreateFeeCategory(const TQString& name, TQString& id); + void slotCreateInterestCategory(const TQString& name, TQString& id); int slotEditInterestSplits(void); int slotEditFeeSplits(void); void slotReloadEditWidgets(void); void slotUpdateActivity(MyMoneySplit::investTransactionTypeE); - void slotUpdateSecurity(const QString& stockId); - void slotUpdateInterestCategory(const QString& id); - void slotUpdateInterestVisibility(const QString&); - void slotUpdateFeeCategory(const QString& id); - void slotUpdateFeeVisibility(const QString&); + void slotUpdateSecurity(const TQString& stockId); + void slotUpdateInterestCategory(const TQString& id); + void slotUpdateInterestVisibility(const TQString&); + void slotUpdateFeeCategory(const TQString& id); + void slotUpdateFeeVisibility(const TQString&); void slotUpdateTotalAmount(void); protected: @@ -132,13 +133,13 @@ protected: void activityFactory(MyMoneySplit::investTransactionTypeE type); - MyMoneyMoney subtotal(const QValueList<MyMoneySplit>& splits) const; + MyMoneyMoney subtotal(const TQValueList<MyMoneySplit>& splits) const; /** * This method creates a transaction to be used for the split fee/interest editor. * It has a reference to a phony account and the splits contained in @a splits . */ - bool createPseudoTransaction(MyMoneyTransaction& t, const QValueList<MyMoneySplit>& splits); + bool createPseudoTransaction(MyMoneyTransaction& t, const TQValueList<MyMoneySplit>& splits); /** * Convenience method used by slotEditInterestSplits() and slotEditFeeSplits(). @@ -151,7 +152,7 @@ protected: * category widget named @p categoryWidgetName in case of multiple splits * in @p splits . */ - int editSplits(const QString& categoryWidgetName, const QString& amountWidgetName, QValueList<MyMoneySplit>& splits, bool isIncome, const char* slotEditSplits); + int editSplits(const TQString& categoryWidgetName, const TQString& amountWidgetName, TQValueList<MyMoneySplit>& splits, bool isIncome, const char* slotEditSplits); void updatePriceMode(const MyMoneySplit& split = MyMoneySplit()); @@ -159,8 +160,8 @@ protected: private: MyMoneySplit m_assetAccountSplit; - QValueList<MyMoneySplit> m_interestSplits; - QValueList<MyMoneySplit> m_feeSplits; + TQValueList<MyMoneySplit> m_interestSplits; + TQValueList<MyMoneySplit> m_feeSplits; MyMoneySecurity m_security; MyMoneySecurity m_currency; MyMoneySplit::investTransactionTypeE m_transactionType; diff --git a/kmymoney2/dialogs/kaccountselectdlg.cpp b/kmymoney2/dialogs/kaccountselectdlg.cpp index 0b172f0..48cef18 100644 --- a/kmymoney2/dialogs/kaccountselectdlg.cpp +++ b/kmymoney2/dialogs/kaccountselectdlg.cpp @@ -23,7 +23,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlabel.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -48,8 +48,8 @@ #include <../kmymoney2.h> -KAccountSelectDlg::KAccountSelectDlg(const KMyMoneyUtils::categoryTypeE accountType, const QString& purpose, QWidget *parent, const char *name ) - : KAccountSelectDlgDecl(parent, name), +KAccountSelectDlg::KAccountSelectDlg(const KMyMoneyUtils::categoryTypeE accountType, const TQString& purpose, TQWidget *tqparent, const char *name ) + : KAccountSelectDlgDecl(tqparent, name), m_purpose(purpose), m_accountType(accountType), m_aborted(false) @@ -62,31 +62,31 @@ KAccountSelectDlg::KAccountSelectDlg(const KMyMoneyUtils::categoryTypeE accountT KIconLoader* il = KGlobal::iconLoader(); KGuiItem skipButtonItem( i18n( "&Skip" ), - QIconSet(il->loadIcon("redo", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("redo", KIcon::Small, KIcon::SizeSmall)), i18n("Skip this transaction"), i18n("Use this to skip importing this transaction and proceed with the next one.")); m_qbuttonCancel->setGuiItem(skipButtonItem); KGuiItem createButtenItem( i18n( "&Create..." ), - QIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), i18n("Create a new account/category"), i18n("Use this to add a new account/category to the file")); m_createButton->setGuiItem(createButtenItem); m_qbuttonOk->setGuiItem(KStdGuiItem::ok()); KGuiItem abortButtenItem( i18n("&Abort" ), - QIconSet(il->loadIcon("stop", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("stop", KIcon::Small, KIcon::SizeSmall)), i18n("Abort the import operation and dismiss all changes"), - i18n("Use this to abort the import. Your financial data will be in the state before you started the QIF import.")); + i18n("Use this to abort the import. Your financial data will be in the state before you started the TQIF import.")); m_kButtonAbort->setGuiItem(abortButtenItem); - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotReloadWidget())); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotReloadWidget())); - connect(m_createButton, SIGNAL(clicked()), this, SLOT(slotCreateAccount())); - connect(m_qbuttonOk, SIGNAL(clicked()), this, SLOT(accept())); - connect(m_qbuttonCancel, SIGNAL(clicked()), this, SLOT(reject())); - connect(m_kButtonAbort, SIGNAL(clicked()), this, SLOT(abort())); + connect(m_createButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateAccount())); + connect(m_qbuttonOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect(m_qbuttonCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(m_kButtonAbort, TQT_SIGNAL(clicked()), this, TQT_SLOT(abort())); } KAccountSelectDlg::~KAccountSelectDlg() @@ -110,17 +110,17 @@ void KAccountSelectDlg::slotReloadWidget(void) set.load(m_accountSelector->selector()); } -void KAccountSelectDlg::setDescription(const QString& msg) +void KAccountSelectDlg::setDescription(const TQString& msg) { m_descLabel->setText(msg); } -void KAccountSelectDlg::setHeader(const QString& msg) +void KAccountSelectDlg::setHeader(const TQString& msg) { m_headerLabel->setText(msg); } -void KAccountSelectDlg::setAccount(const MyMoneyAccount& account, const QString& id) +void KAccountSelectDlg::setAccount(const MyMoneyAccount& account, const TQString& id) { m_account = account; m_accountSelector->setSelectedItem(id); @@ -184,7 +184,7 @@ int KAccountSelectDlg::exec(void) return rc; } -const QString& KAccountSelectDlg::selectedAccount(void) const +const TQString& KAccountSelectDlg::selectedAccount(void) const { return m_accountSelector->selectedItem(); } diff --git a/kmymoney2/dialogs/kaccountselectdlg.h b/kmymoney2/dialogs/kaccountselectdlg.h index 271cd0f..180587e 100644 --- a/kmymoney2/dialogs/kaccountselectdlg.h +++ b/kmymoney2/dialogs/kaccountselectdlg.h @@ -26,8 +26,8 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -47,8 +47,9 @@ class KAccountSelectDlg : public KAccountSelectDlgDecl { Q_OBJECT + TQ_OBJECT public: - KAccountSelectDlg(const KMyMoneyUtils::categoryTypeE type, const QString& purpose = "General", QWidget *parent=0, const char *name=0); + KAccountSelectDlg(const KMyMoneyUtils::categoryTypeE type, const TQString& purpose = "General", TQWidget *tqparent=0, const char *name=0); ~KAccountSelectDlg(); /** @@ -56,9 +57,9 @@ public: * selection dialog box. The @p msg should contain a descriptive * text about the purpose of the dialog and it's options. * - * @param msg const reference to QString object containing the text. + * @param msg const reference to TQString object containing the text. */ - void setDescription(const QString& msg); + void setDescription(const TQString& msg); /** * This method is used to setup the buddy text of the account @@ -66,9 +67,9 @@ public: * which is placed above the selection box with the account * names. * - * @param msg const reference to QString object containing the text. + * @param msg const reference to TQString object containing the text. */ - void setHeader(const QString& msg); + void setHeader(const TQString& msg); /** * This method is used to pass information to the account selection @@ -78,14 +79,14 @@ public: * @param account MyMoneyAccount filled with the relevant and available information * @param id account id to be used. */ - void setAccount(const MyMoneyAccount& account, const QString& id); + void setAccount(const MyMoneyAccount& account, const TQString& id); /** * This method returns the name of the selected account in the combo box. * - * @return QString containing the id of the selected account + * @return TQString containing the id of the selected account */ - const QString& selectedAccount(void) const; + const TQString& selectedAccount(void) const; /** * This method is used to set the mode of the dialog. Two modes @@ -117,7 +118,7 @@ public: public slots: /** - * Reimplemented from QDialog + * Reimplemented from TQDialog */ int exec(); @@ -145,7 +146,7 @@ protected slots: void slotReloadWidget(void); private: - QString m_purpose; + TQString m_purpose; MyMoneyAccount m_account; int m_mode; // 0 - select or create, 1 - create only KMyMoneyUtils::categoryTypeE m_accountType; diff --git a/kmymoney2/dialogs/kaccountselectdlgdecl.ui b/kmymoney2/dialogs/kaccountselectdlgdecl.ui index 1908339..09b8afb 100644 --- a/kmymoney2/dialogs/kaccountselectdlgdecl.ui +++ b/kmymoney2/dialogs/kaccountselectdlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KAccountSelectDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KAccountSelectDlgDecl</cstring> </property> @@ -28,15 +28,15 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>m_qifEntry</cstring> </property> @@ -56,17 +56,17 @@ <bool>false</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <grid> <property name="name"> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>20</height> @@ -107,7 +107,7 @@ <cstring>m_descLabel</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_headerLabel</cstring> </property> @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -152,9 +152,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>160</width> <height>0</height> @@ -211,5 +211,8 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kbackupdlg.cpp b/kmymoney2/dialogs/kbackupdlg.cpp index d98aeaf..d975e46 100644 --- a/kmymoney2/dialogs/kbackupdlg.cpp +++ b/kmymoney2/dialogs/kbackupdlg.cpp @@ -20,21 +20,17 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qpixmap.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qcheckbox.h> +#include <tqpixmap.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> // ---------------------------------------------------------------------------- // KDE Includes #include <kglobal.h> #include <klocale.h> -#if QT_VERSION > 300 #include <kstandarddirs.h> -#else -#include <kstddirs.h> -#endif #include <kconfig.h> #include <kdirselectdialog.h> @@ -48,8 +44,8 @@ #include "kbackupdlg.h" -KBackupDlg::KBackupDlg( QWidget* parent, const char* name/*, bool modal*/) - : kbackupdlgdecl( parent, name , true) +KBackupDlg::KBackupDlg( TQWidget* tqparent, const char* name/*, bool modal*/) + : kbackupdlgdecl( tqparent, name , true) { readConfig(); @@ -59,14 +55,14 @@ KBackupDlg::KBackupDlg( QWidget* parent, const char* name/*, bool modal*/) btnCancel->setGuiItem(KStdGuiItem::cancel()); KGuiItem chooseButtenItem( i18n("C&hoose..."), - QIconSet(il->loadIcon("folder", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("folder", KIcon::Small, KIcon::SizeSmall)), i18n("Select mount point"), i18n("Use this to browse to the mount point.")); chooseButton->setGuiItem(chooseButtenItem); - connect(chooseButton, SIGNAL(clicked()), this, SLOT(chooseButtonClicked())); - connect(btnOK,SIGNAL(clicked()),this,SLOT(accept())); - connect(btnCancel,SIGNAL(clicked()),this,SLOT(reject())); + connect(chooseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseButtonClicked())); + connect(btnOK,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept())); + connect(btnCancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); } KBackupDlg::~KBackupDlg() diff --git a/kmymoney2/dialogs/kbackupdlg.h b/kmymoney2/dialogs/kbackupdlg.h index b275606..be2e749 100644 --- a/kmymoney2/dialogs/kbackupdlg.h +++ b/kmymoney2/dialogs/kbackupdlg.h @@ -20,7 +20,7 @@ #ifndef KBACKUPDIALOG_H #define KBACKUPDIALOG_H -#include <qwidget.h> +#include <tqwidget.h> #include "../dialogs/kbackupdlgdecl.h" /** @@ -29,6 +29,7 @@ class KBackupDlg : public kbackupdlgdecl { Q_OBJECT + TQ_OBJECT private: void readConfig(void); void writeConfig(void); @@ -37,7 +38,7 @@ protected slots: void chooseButtonClicked(); public: - KBackupDlg( QWidget* parent, const char* name/*, bool modal*/); + KBackupDlg( TQWidget* tqparent, const char* name/*, bool modal*/); ~KBackupDlg(); }; diff --git a/kmymoney2/dialogs/kbackupdlgdecl.ui b/kmymoney2/dialogs/kbackupdlgdecl.ui index ff9795f..ae7cce6 100644 --- a/kmymoney2/dialogs/kbackupdlgdecl.ui +++ b/kmymoney2/dialogs/kbackupdlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>kbackupdlgdecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>kbackupdlgdecl</cstring> </property> @@ -17,7 +17,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -31,7 +31,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -42,7 +42,7 @@ Please make sure you have a disk inserted and that the drive is ready. Then choo Click OK to perform the backup. If your system does not use an automounter, make sure you mark the checkbox below to "mount this directory before backing up."</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -62,7 +62,7 @@ Click OK to perform the backup. If your system does not use an automounter, make <enum>Horizontal</enum> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -79,7 +79,7 @@ Click OK to perform the backup. If your system does not use an automounter, make <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout42</cstring> </property> @@ -93,7 +93,7 @@ Click OK to perform the backup. If your system does not use an automounter, make <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblMountPoint</cstring> </property> @@ -102,7 +102,7 @@ Click OK to perform the backup. If your system does not use an automounter, make <comment>This is the mount point</comment> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>txtMountPoint</cstring> </property> @@ -117,7 +117,7 @@ Click OK to perform the backup. If your system does not use an automounter, make </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mountCheckBox</cstring> </property> @@ -135,7 +135,7 @@ Click OK to perform the backup. If your system does not use an automounter, make <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>24</height> @@ -144,7 +144,7 @@ Click OK to perform the backup. If your system does not use an automounter, make </spacer> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout44</cstring> </property> @@ -168,7 +168,7 @@ Click OK to perform the backup. If your system does not use an automounter, make <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>455</width> <height>0</height> @@ -206,5 +206,5 @@ Click OK to perform the backup. If your system does not use an automounter, make </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kbalancechartdlg.cpp b/kmymoney2/dialogs/kbalancechartdlg.cpp index 05eccf3..f1fcdda 100644 --- a/kmymoney2/dialogs/kbalancechartdlg.cpp +++ b/kmymoney2/dialogs/kbalancechartdlg.cpp @@ -22,8 +22,8 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlayout.h> -#include <qframe.h> +#include <tqlayout.h> +#include <tqframe.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -52,22 +52,22 @@ #define KMM_KDCHART_PROPSET_NORMAL_DATA KDCHART_PROPSET_NORMAL_DATA #endif -KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, QWidget* parent, const char* name) : - KDialog(parent, name) +KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* tqparent, const char* name) : + KDialog(tqparent, name) { #ifdef HAVE_KDCHART - setCaption(i18n("Balance of %1").arg(account.name())); + setCaption(i18n("Balance of %1").tqarg(account.name())); setSizeGripEnabled( TRUE ); setModal( TRUE ); - QVBoxLayout* KBalanceChartDlgLayout = new QVBoxLayout( this, 11, 6, "KBalanceChartDlgLayout"); + TQVBoxLayout* KBalanceChartDlgLayout = new TQVBoxLayout( this, 11, 6, "KBalanceChartDlgLayout"); MyMoneyReport reportCfg = MyMoneyReport( MyMoneyReport::eAssetLiability, MyMoneyReport::eMonths, MyMoneyTransactionFilter::userDefined, // overridden by the setDateFilter() call below MyMoneyReport::eDetailTotal, - i18n("%1 Balance History").arg(account.name()), + i18n("%1 Balance History").tqarg(account.name()), i18n("Generated Report") ); reportCfg.setChartByDefault(true); @@ -76,14 +76,14 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, QWidget* paren reportCfg.setChartType(MyMoneyReport::eChartLine); reportCfg.setIncludingSchedules( true ); if(account.accountType() == MyMoneyAccount::Investment) { - QStringList::const_iterator it_a; + TQStringList::const_iterator it_a; for(it_a = account.accountList().begin(); it_a != account.accountList().end(); ++it_a) reportCfg.addAccount(*it_a); } else reportCfg.addAccount(account.id()); reportCfg.setColumnsAreDays( true ); reportCfg.setConvertCurrency( false ); - reportCfg.setDateFilter(QDate::currentDate().addDays(-90),QDate::currentDate().addDays(+90)); + reportCfg.setDateFilter(TQDate::tqcurrentDate().addDays(-90),TQDate::tqcurrentDate().addDays(+90)); reports::PivotTable table(reportCfg); @@ -102,7 +102,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, QWidget* paren int m_idPropFutureValue = chartWidget->params()->registerProperties(propSetFutureValue); KDChartPropertySet propSetLastValue("last value", m_idPropFutureValue); - propSetLastValue.setExtraLinesAlign(KDChartPropertySet::OwnID, Qt::AlignLeft | Qt::AlignBottom); + propSetLastValue.setExtraLinesAlign(KDChartPropertySet::OwnID, TQt::AlignLeft | TQt::AlignBottom); propSetLastValue.setExtraLinesWidth(KDChartPropertySet::OwnID, -4); propSetLastValue.setExtraLinesColor(KDChartPropertySet::OwnID, KMyMoneyGlobalSettings::listGridColor()); @@ -110,7 +110,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, QWidget* paren KDChartPropertySet propSetMinBalance("min balance", m_idPropFutureValue); propSetMinBalance.setLineStyle(KDChartPropertySet::OwnID, Qt::NoPen); - propSetMinBalance.setExtraLinesAlign(KDChartPropertySet::OwnID, Qt::AlignLeft | Qt::AlignRight); + propSetMinBalance.setExtraLinesAlign(KDChartPropertySet::OwnID, TQt::AlignLeft | TQt::AlignRight); int m_idPropMinBalance = chartWidget->params()->registerProperties(propSetMinBalance); KDChartPropertySet propSetMaxCredit("max credit", m_idPropMinBalance); @@ -180,13 +180,13 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, QWidget* paren - QFrame* line1 = new QFrame( this, "line1" ); - line1->setFrameShape( QFrame::HLine ); - line1->setFrameShadow( QFrame::Sunken ); - line1->setFrameShape( QFrame::HLine ); + TQFrame* line1 = new TQFrame( this, "line1" ); + line1->setFrameShape( TQFrame::HLine ); + line1->setFrameShadow( TQFrame::Sunken ); + line1->setFrameShape( TQFrame::HLine ); KBalanceChartDlgLayout->addWidget(line1); - QHBoxLayout* Layout1 = new QHBoxLayout( KBalanceChartDlgLayout, 6, "Layout1"); + TQHBoxLayout* Layout1 = new TQHBoxLayout( KBalanceChartDlgLayout, 6, "Layout1"); #if 0 KPushButton* buttonHelp = new KPushButton( this, "buttonHelp" ); buttonHelp->setAutoDefault( TRUE ); @@ -194,8 +194,8 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, QWidget* paren Layout1->addWidget( buttonHelp ); #endif - QSpacerItem* Horizontal_Spacing2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); - Layout1->addItem( Horizontal_Spacing2 ); + TQSpacerItem*Horizontal_Spacing2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + Layout1->addItem(Horizontal_Spacing2 ); #if 0 KPushButton* buttonOk = new KPushButton( this, "buttonOk" ); @@ -210,10 +210,10 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, QWidget* paren buttonClose->setGuiItem(KStdGuiItem::Close); Layout1->addWidget( buttonClose ); - // connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( buttonClose, SIGNAL( clicked() ), this, SLOT( accept() ) ); + // connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( buttonClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - resize( QSize(700, 500).expandedTo(minimumSizeHint()) ); + resize( TQSize(700, 500).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); #endif } diff --git a/kmymoney2/dialogs/kbalancechartdlg.h b/kmymoney2/dialogs/kbalancechartdlg.h index 8fe2502..afb1b1d 100644 --- a/kmymoney2/dialogs/kbalancechartdlg.h +++ b/kmymoney2/dialogs/kbalancechartdlg.h @@ -37,8 +37,9 @@ class MyMoneyAccount; class KBalanceChartDlg : public KDialog { Q_OBJECT + TQ_OBJECT public: - KBalanceChartDlg(const MyMoneyAccount& account, QWidget* parent = 0, const char* name = 0); + KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* tqparent = 0, const char* name = 0); ~KBalanceChartDlg(); }; diff --git a/kmymoney2/dialogs/kbalancewarning.cpp b/kmymoney2/dialogs/kbalancewarning.cpp index 16f3dc0..358210c 100644 --- a/kmymoney2/dialogs/kbalancewarning.cpp +++ b/kmymoney2/dialogs/kbalancewarning.cpp @@ -18,8 +18,8 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -36,12 +36,12 @@ class KBalanceWarning::Private { public: - QString dontShowAgain() const { return "BalanceWarning"; } - QMap<QString, bool> m_deselectedAccounts; + TQString dontShowAgain() const { return "BalanceWarning"; } + TQMap<TQString, bool> m_deselectedAccounts; }; -KBalanceWarning::KBalanceWarning(QObject* parent, const char* name) : - QObject(parent, name), +KBalanceWarning::KBalanceWarning(TQObject* tqparent, const char* name) : + TQObject(tqparent, name), d(new Private) { KMessageBox::enableMessage(d->dontShowAgain()); @@ -52,10 +52,10 @@ KBalanceWarning::~KBalanceWarning() delete d; } -void KBalanceWarning::slotShowMessage(QWidget* parent, const MyMoneyAccount& account, const QString& msg) +void KBalanceWarning::slotShowMessage(TQWidget* tqparent, const MyMoneyAccount& account, const TQString& msg) { - if(d->m_deselectedAccounts.find(account.id()) == d->m_deselectedAccounts.end()) { - KMessageBox::information(parent, msg, QString::null, d->dontShowAgain()); + if(d->m_deselectedAccounts.tqfind(account.id()) == d->m_deselectedAccounts.end()) { + KMessageBox::information(tqparent, msg, TQString(), d->dontShowAgain()); if(!KMessageBox::shouldBeShownContinue(d->dontShowAgain())) { d->m_deselectedAccounts[account.id()] = true; KMessageBox::enableMessage(d->dontShowAgain()); diff --git a/kmymoney2/dialogs/kbalancewarning.h b/kmymoney2/dialogs/kbalancewarning.h index 2e3c4d4..cb9848d 100644 --- a/kmymoney2/dialogs/kbalancewarning.h +++ b/kmymoney2/dialogs/kbalancewarning.h @@ -20,9 +20,9 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qobject.h> -class QString; -class QWidget; +#include <tqobject.h> +class TQString; +class TQWidget; // ---------------------------------------------------------------------------- // KDE Includes @@ -32,15 +32,16 @@ class QWidget; class MyMoneyAccount; -class KBalanceWarning : public QObject +class KBalanceWarning : public TQObject { Q_OBJECT + TQ_OBJECT public: - KBalanceWarning(QObject* parent, const char* name = 0); + KBalanceWarning(TQObject* tqparent, const char* name = 0); virtual ~KBalanceWarning(); public slots: - void slotShowMessage(QWidget* parent, const MyMoneyAccount& account, const QString& msg); + void slotShowMessage(TQWidget* tqparent, const MyMoneyAccount& account, const TQString& msg); private: class Private; diff --git a/kmymoney2/dialogs/kcategoryreassigndlg.cpp b/kmymoney2/dialogs/kcategoryreassigndlg.cpp index f457134..3bead48 100644 --- a/kmymoney2/dialogs/kcategoryreassigndlg.cpp +++ b/kmymoney2/dialogs/kcategoryreassigndlg.cpp @@ -36,12 +36,12 @@ #include <kmymoney/kmymoneyaccountselector.h> #include <kmymoney/kguiutils.h> -KCategoryReassignDlg::KCategoryReassignDlg( QWidget* parent, const char* name) : - KCategoryReassignDlgDecl( parent, name) +KCategoryReassignDlg::KCategoryReassignDlg( TQWidget* tqparent, const char* name) : + KCategoryReassignDlgDecl( tqparent, name) { buttonOk->setGuiItem(KStdGuiItem::ok()); buttonCancel->setGuiItem(KStdGuiItem::cancel()); - kMandatoryFieldGroup* mandatory = new kMandatoryFieldGroup(this); + kMandatoryFieldGroup* mandatory = new kMandatoryFieldGroup(TQT_TQOBJECT(this)); mandatory->add(m_category); mandatory->setOkButton(buttonOk); } @@ -50,10 +50,10 @@ KCategoryReassignDlg::~KCategoryReassignDlg() { } -QString KCategoryReassignDlg::show(const MyMoneyAccount& category) +TQString KCategoryReassignDlg::show(const MyMoneyAccount& category) { if (category.id().isEmpty()) - return QString(); // no payee available? nothing can be selected... + return TQString(); // no payee available? nothing can be selected... AccountSet set; set.addAccountGroup(MyMoneyAccount::Income); @@ -64,8 +64,8 @@ QString KCategoryReassignDlg::show(const MyMoneyAccount& category) m_category->selector()->removeItem(category.id()); // make sure the available categories have the same currency - QStringList list; - QStringList::const_iterator it_a; + TQStringList list; + TQStringList::const_iterator it_a; m_category->selector()->itemList(list); for(it_a = list.begin(); it_a != list.end(); ++it_a) { MyMoneyAccount acc = MyMoneyFile::instance()->account(*it_a); @@ -78,13 +78,13 @@ QString KCategoryReassignDlg::show(const MyMoneyAccount& category) // if there is no category for reassignment left, we bail out if(list.isEmpty()) { - KMessageBox::sorry(this, QString("<qt>")+i18n("At least one transaction/schedule still references the category <b>%1</b>. However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").arg(category.name())+QString("</qt>")); - return QString(); + KMessageBox::sorry(this, TQString("<qt>")+i18n("At least one transaction/schedule still references the category <b>%1</b>. However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").tqarg(category.name())+TQString("</qt>")); + return TQString(); } // execute dialog and if aborted, return empty string - if (this->exec() == QDialog::Rejected) - return QString(); + if (this->exec() == TQDialog::Rejected) + return TQString(); // otherwise return index of selected payee return m_category->selectedItem(); diff --git a/kmymoney2/dialogs/kcategoryreassigndlg.h b/kmymoney2/dialogs/kcategoryreassigndlg.h index ce756ee..4639bd4 100644 --- a/kmymoney2/dialogs/kcategoryreassigndlg.h +++ b/kmymoney2/dialogs/kcategoryreassigndlg.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qvaluelist.h> +#include <tqvaluelist.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -39,9 +39,10 @@ class KCategoryReassignDlg : public KCategoryReassignDlgDecl { Q_OBJECT + TQ_OBJECT public: /** Default constructor */ - KCategoryReassignDlg( QWidget* parent = 0, const char* name = 0); + KCategoryReassignDlg( TQWidget* tqparent = 0, const char* name = 0); /** Destructor */ ~KCategoryReassignDlg(); @@ -52,11 +53,11 @@ public: * * @param category reference to MyMoneyAccount object of the category to be deleted * - * @return Returns the id of the selected category in the list or QString() if - * the dialog was aborted. QString() is also returned if the @a category + * @return Returns the id of the selected category in the list or TQString() if + * the dialog was aborted. TQString() is also returned if the @a category * does not have an id. */ - QString show(const MyMoneyAccount& category); + TQString show(const MyMoneyAccount& category); protected: void accept(void); diff --git a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui b/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui index 5b9a954..be2e661 100644 --- a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui +++ b/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KCategoryReassignDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KCategoryeReassignDlgDecl</cstring> </property> @@ -25,11 +25,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>0</height> @@ -38,7 +38,7 @@ <property name="text"> <string>The transactions, schedules and budgets associated with the selected category need to be re-assigned to a different category before the selected category can be deleted. Please select a category from the list below.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> @@ -52,14 +52,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -103,9 +103,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>305</width> <height>20</height> @@ -171,5 +171,8 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kchooseimportexportdlg.cpp b/kmymoney2/dialogs/kchooseimportexportdlg.cpp index 0c390a8..1038bf1 100644 --- a/kmymoney2/dialogs/kchooseimportexportdlg.cpp +++ b/kmymoney2/dialogs/kchooseimportexportdlg.cpp @@ -19,17 +19,13 @@ ***************************************************************************/ #include <kglobal.h> #include <klocale.h> -#if QT_VERSION > 300 #include <kstandarddirs.h> -#else -#include <kstddirs.h> -#endif -#include <qpixmap.h> +#include <tqpixmap.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qpushbutton.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqpushbutton.h> #include <kglobal.h> #include <kconfig.h> @@ -37,10 +33,10 @@ #include "kchooseimportexportdlg.h" -KChooseImportExportDlg::KChooseImportExportDlg(int type, QWidget *parent, const char *name ) - : KChooseImportExportDlgDecl(parent,name, true) +KChooseImportExportDlg::KChooseImportExportDlg(int type, TQWidget *tqparent, const char *name ) + : KChooseImportExportDlgDecl(tqparent,name, true) { - QString filename; + TQString filename; if (type==0) { // import topLabel->setText(i18n("Please choose the type of import you wish to perform. A simple explanation\n" @@ -60,11 +56,11 @@ KChooseImportExportDlg::KChooseImportExportDlg(int type, QWidget *parent, const readConfig(); slotTypeActivated(m_lastType); - typeCombo->setCurrentItem(((m_lastType=="QIF") ? 0 : 1)); + typeCombo->setCurrentItem(((m_lastType=="TQIF") ? 0 : 1)); - connect(typeCombo, SIGNAL(activated(const QString&)), this, SLOT(slotTypeActivated(const QString&))); - connect(okButton, SIGNAL(clicked()), this, SLOT(accept())); - connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject())); + connect(typeCombo, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotTypeActivated(const TQString&))); + connect(okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect(cancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); } KChooseImportExportDlg::~KChooseImportExportDlg() @@ -72,10 +68,10 @@ KChooseImportExportDlg::~KChooseImportExportDlg() writeConfig(); } -void KChooseImportExportDlg::slotTypeActivated(const QString& text) +void KChooseImportExportDlg::slotTypeActivated(const TQString& text) { - if (text=="QIF") { - descriptionLabel->setText(i18n("QIF files are created by the popular accounting program Quicken.\n" + if (text=="TQIF") { + descriptionLabel->setText(i18n("TQIF files are created by the popular accounting program Quicken.\n" "Another dialog will appear, if you choose this type, asking for further\n" "information relevant to the Quicken format.")); } else { @@ -85,7 +81,7 @@ void KChooseImportExportDlg::slotTypeActivated(const QString& text) } } -QString KChooseImportExportDlg::importExportType(void) +TQString KChooseImportExportDlg::importExportType(void) { return typeCombo->currentText(); } diff --git a/kmymoney2/dialogs/kchooseimportexportdlg.h b/kmymoney2/dialogs/kchooseimportexportdlg.h index ac562f3..c93ba8b 100644 --- a/kmymoney2/dialogs/kchooseimportexportdlg.h +++ b/kmymoney2/dialogs/kchooseimportexportdlg.h @@ -21,7 +21,7 @@ #ifndef KCHOOSEIMPORTEXPORTDLG_H #define KCHOOSEIMPORTEXPORTDLG_H -#include <qwidget.h> +#include <tqwidget.h> #include "../dialogs/kchooseimportexportdlgdecl.h" /** @@ -30,18 +30,19 @@ class KChooseImportExportDlg : public KChooseImportExportDlgDecl { Q_OBJECT + TQ_OBJECT private: void readConfig(void); void writeConfig(void); - QString m_lastType; + TQString m_lastType; protected slots: - void slotTypeActivated(const QString& text); + void slotTypeActivated(const TQString& text); public: - KChooseImportExportDlg(int type, QWidget *parent=0, const char *name=0); + KChooseImportExportDlg(int type, TQWidget *tqparent=0, const char *name=0); ~KChooseImportExportDlg(); - QString importExportType(void); + TQString importExportType(void); }; #endif diff --git a/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui b/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui index 3d12a14..f52cbca 100644 --- a/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui +++ b/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI> <class>KChooseImportExportDlgDecl</class> <widget> - <class>QDialog</class> + <class>TQDialog</class> <property stdset="1"> <name>name</name> <cstring>kChooseImportDlgDecl</cstring> @@ -20,7 +20,7 @@ <number>6</number> </property> <widget> - <class>QLayoutWidget</class> + <class>TQLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout4</cstring> @@ -35,7 +35,7 @@ <number>6</number> </property> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>topLabel</cstring> @@ -67,7 +67,7 @@ Once you have chosen an import type please press the OK button.</string> </property> </widget> <widget> - <class>QLayoutWidget</class> + <class>TQLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout3</cstring> @@ -95,7 +95,7 @@ Once you have chosen an import type please press the OK button.</string> <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> @@ -103,7 +103,7 @@ Once you have chosen an import type please press the OK button.</string> </property> </spacer> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>promptLabel</cstring> @@ -114,11 +114,11 @@ Once you have chosen an import type please press the OK button.</string> </property> </widget> <widget> - <class>QComboBox</class> + <class>TQComboBox</class> <item> <property> <name>text</name> - <string>QIF</string> + <string>TQIF</string> </property> </item> <item> @@ -132,7 +132,7 @@ Once you have chosen an import type please press the OK button.</string> <cstring>typeCombo</cstring> </property> <property stdset="1"> - <name>minimumSize</name> + <name>tqminimumSize</name> <size> <width>100</width> <height>0</height> @@ -142,7 +142,7 @@ Once you have chosen an import type please press the OK button.</string> </hbox> </widget> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>descriptionLabel</cstring> @@ -155,7 +155,7 @@ Once you have chosen an import type please press the OK button.</string> </sizepolicy> </property> <property stdset="1"> - <name>minimumSize</name> + <name>tqminimumSize</name> <size> <width>410</width> <height>100</height> @@ -167,7 +167,7 @@ Once you have chosen an import type please press the OK button.</string> </property> </widget> <widget> - <class>QLayoutWidget</class> + <class>TQLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout2</cstring> @@ -195,7 +195,7 @@ Once you have chosen an import type please press the OK button.</string> <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> @@ -203,7 +203,7 @@ Once you have chosen an import type please press the OK button.</string> </property> </spacer> <widget> - <class>QPushButton</class> + <class>TQPushButton</class> <property stdset="1"> <name>name</name> <cstring>okButton</cstring> @@ -218,7 +218,7 @@ Once you have chosen an import type please press the OK button.</string> </property> </widget> <widget> - <class>QPushButton</class> + <class>TQPushButton</class> <property stdset="1"> <name>name</name> <cstring>cancelButton</cstring> diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp b/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp index 3c20a48..8c1678f 100644 --- a/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp +++ b/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qradiobutton.h> +#include <tqradiobutton.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -36,8 +36,8 @@ #include <kmymoney/kmymoneyutils.h> #include "kconfirmmanualenterdlg.h" -KConfirmManualEnterDlg::KConfirmManualEnterDlg(const MyMoneySchedule& schedule, QWidget* parent, const char* name) : - KConfirmManualEnterDlgDecl(parent, name) +KConfirmManualEnterDlg::KConfirmManualEnterDlg(const MyMoneySchedule& schedule, TQWidget* tqparent, const char* name) : + KConfirmManualEnterDlgDecl(tqparent, name) { buttonOk->setGuiItem(KStdGuiItem::ok()); buttonCancel->setGuiItem(KStdGuiItem::cancel()); @@ -53,7 +53,7 @@ KConfirmManualEnterDlg::KConfirmManualEnterDlg(const MyMoneySchedule& schedule, void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, const MyMoneyTransaction& tn) { - QString messageDetail("<qt>"); + TQString messageDetail("<qt>"); MyMoneyFile* file = MyMoneyFile::instance(); int noItemsChanged=0; @@ -75,7 +75,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons try { - QString po, pn; + TQString po, pn; if(to.splits()[0].payeeId()) po = file->payee(to.splits()[0].payeeId()).name(); if(tn.splits()[0].payeeId()) @@ -83,7 +83,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons if (po != pn) { noItemsChanged++; - messageDetail += i18n("Payee changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").arg(po).arg(pn); + messageDetail += i18n("Payee changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").tqarg(po).tqarg(pn); } #if 0 if ( (m_schedule.type() == MyMoneySchedule::TYPE_TRANSFER || @@ -92,7 +92,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons { noItemsChanged++; messageDetail += i18n("Account changed. Old: \"%1\", New: \"%2\"") - .arg(m_schedule.account().name()).arg(m_from->currentText()) + QString("\n"); + .tqarg(m_schedule.account().name()).tqarg(m_from->currentText()) + TQString("\n"); } if ( m_schedule.type() == MyMoneySchedule::TYPE_DEPOSIT && @@ -100,26 +100,26 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons { noItemsChanged++; messageDetail += i18n("Account changed. Old: \"%1\", New: \"%2\"") - .arg(m_schedule.account().name()).arg(m_to->currentText()) + QString("\n"); + .tqarg(m_schedule.account().name()).tqarg(m_to->currentText()) + TQString("\n"); } #endif if(to.splits()[0].accountId() != tn.splits()[0].accountId()) { noItemsChanged++; messageDetail += i18n("Account changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>") - .arg(file->account(to.splits()[0].accountId()).name()) - .arg(file->account(tn.splits()[0].accountId()).name()); + .tqarg(file->account(to.splits()[0].accountId()).name()) + .tqarg(file->account(tn.splits()[0].accountId()).name()); } if(file->isTransfer(to) && file->isTransfer(tn)) { if(to.splits()[1].accountId() != tn.splits()[1].accountId()) { noItemsChanged++; messageDetail += i18n("Transfer account changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>") - .arg(file->account(to.splits()[1].accountId()).name()) - .arg(file->account(tn.splits()[1].accountId()).name()); + .tqarg(file->account(to.splits()[1].accountId()).name()) + .tqarg(file->account(tn.splits()[1].accountId()).name()); } } else { - QString co, cn; + TQString co, cn; switch(to.splitCount()) { default: co = i18n("Split transaction (category replacement)", "Split transaction"); @@ -142,21 +142,21 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons if (co != cn) { noItemsChanged++; - messageDetail += i18n("Category changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").arg(co).arg(cn); + messageDetail += i18n("Category changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").tqarg(co).tqarg(cn); } } - QString mo, mn; + TQString mo, mn; mo = to.splits()[0].memo(); mn = tn.splits()[0].memo(); if(mo.isEmpty()) - mo = QString("<i>")+i18n("empty")+QString("</i>"); + mo = TQString("<i>")+i18n("empty")+TQString("</i>"); if(mn.isEmpty()) - mn = QString("<i>")+i18n("empty")+QString("</i>"); + mn = TQString("<i>")+i18n("empty")+TQString("</i>"); if (mo != mn) { noItemsChanged++; - messageDetail += i18n("Memo changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").arg(mo).arg(mn); + messageDetail += i18n("Memo changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").tqarg(mo).tqarg(mn); } const MyMoneySecurity& sec = MyMoneyFile::instance()->security(to.commodity()); @@ -166,7 +166,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons if (ao != an) { noItemsChanged++; messageDetail += i18n("Amount changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>") - .arg(ao.formatMoney(sec.smallestAccountFraction())).arg(an.formatMoney(sec.smallestAccountFraction())); + .tqarg(ao.formatMoney(sec.smallestAccountFraction())).tqarg(an.formatMoney(sec.smallestAccountFraction())); } MyMoneySplit::reconcileFlagE fo, fn; @@ -175,8 +175,8 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons if(fo != fn) { noItemsChanged++; messageDetail += i18n("Reconciliation flag changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>") - .arg(KMyMoneyUtils::reconcileStateToString(fo, true)) - .arg(KMyMoneyUtils::reconcileStateToString(fn, true)); + .tqarg(KMyMoneyUtils::reconcileStateToString(fo, true)) + .tqarg(KMyMoneyUtils::reconcileStateToString(fn, true)); } } catch (MyMoneyException *e) diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlg.h b/kmymoney2/dialogs/kconfirmmanualenterdlg.h index 43ff65a..95a0b9b 100644 --- a/kmymoney2/dialogs/kconfirmmanualenterdlg.h +++ b/kmymoney2/dialogs/kconfirmmanualenterdlg.h @@ -36,8 +36,9 @@ class KConfirmManualEnterDlg : public KConfirmManualEnterDlgDecl { Q_OBJECT + TQ_OBJECT public: - KConfirmManualEnterDlg(const MyMoneySchedule& schedule, QWidget* parent = 0, const char* name = 0); + KConfirmManualEnterDlg(const MyMoneySchedule& schedule, TQWidget* tqparent = 0, const char* name = 0); typedef enum { UseOriginal = 0, diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui b/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui index f88f0ce..f358370 100644 --- a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui +++ b/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KConfirmManualEnterDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KConfirmManualEnterDlgDecl</cstring> </property> @@ -28,7 +28,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_message</cstring> </property> @@ -47,7 +47,7 @@ <bool>true</bool> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -65,7 +65,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_discardRadio</cstring> </property> @@ -73,7 +73,7 @@ <string>Discard the changes and enter the original transaction into the register.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_onceRadio</cstring> </property> @@ -81,7 +81,7 @@ <string>Enter these new values this one time, for this occurence only.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_setRadio</cstring> </property> @@ -91,9 +91,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>180</width> <height>16</height> @@ -156,5 +156,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kcsvprogressdlg.cpp b/kmymoney2/dialogs/kcsvprogressdlg.cpp index d8f85ed..7b923e7 100644 --- a/kmymoney2/dialogs/kcsvprogressdlg.cpp +++ b/kmymoney2/dialogs/kcsvprogressdlg.cpp @@ -19,22 +19,18 @@ ***************************************************************************/ #include <kglobal.h> #include <klocale.h> -#if QT_VERSION > 300 #include <kstandarddirs.h> -#else -#include <kstddirs.h> -#endif -#include <qpixmap.h> +#include <tqpixmap.h> // ---------------------------------------------------------------------------- // QT Includes -#include <qfile.h> -#include <qtextstream.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qprogressbar.h> -#include <qlineedit.h> -#include <qgroupbox.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqprogressbar.h> +#include <tqlineedit.h> +#include <tqgroupbox.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -51,8 +47,8 @@ #include "../kmymoneyutils.h" /** Simple constructor */ -KCsvProgressDlg::KCsvProgressDlg(int type, MyMoneyAccount *account, QWidget *parent, const char *name ) - : KCsvProgressDlgDecl(parent,name, true) +KCsvProgressDlg::KCsvProgressDlg(int type, MyMoneyAccount *account, TQWidget *tqparent, const char *name ) + : KCsvProgressDlgDecl(tqparent,name, true) { m_nType = type; if (m_nType==0) @@ -70,11 +66,11 @@ KCsvProgressDlg::KCsvProgressDlg(int type, MyMoneyAccount *account, QWidget *par readConfig(); - connect(m_qbuttonBrowse, SIGNAL(clicked()), this, SLOT(slotBrowseClicked())); - connect(m_qbuttonRun, SIGNAL(clicked()), this, SLOT(slotRunClicked())); - connect(m_qlineeditFile, SIGNAL(textChanged(const QString&)), this, - SLOT(slotFileTextChanged(const QString&))); - connect(m_qbuttonOk, SIGNAL(clicked()), this, SLOT(accept())); + connect(m_qbuttonBrowse, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowseClicked())); + connect(m_qbuttonRun, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRunClicked())); + connect(m_qlineeditFile, TQT_SIGNAL(textChanged(const TQString&)), this, + TQT_SLOT(slotFileTextChanged(const TQString&))); + connect(m_qbuttonOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); } /** Simple destructor */ @@ -94,16 +90,16 @@ void KCsvProgressDlg::performExport(void) return; } - QString strFile = m_qlineeditFile->text(); - if(KMyMoneyUtils::appendCorrectFileExt(strFile, QString("csv"))) + TQString strFile = m_qlineeditFile->text(); + if(KMyMoneyUtils::appendCorrectFileExt(strFile, TQString("csv"))) m_qlineeditFile->setText(strFile); - if (m_kmymoneydateEnd->getQDate() < m_kmymoneydateStart->getQDate()) { + if (m_kmymoneydateEnd->getTQDate() < m_kmymoneydateStart->getTQDate()) { KMessageBox::information(this, i18n("Please enter a start date lower than the end date.")); return; } - QFile qfile(m_qlineeditFile->text()); + TQFile qfile(m_qlineeditFile->text()); if (!qfile.open(IO_WriteOnly)) { KMessageBox::error(this, i18n("Unable to open export file for writing.")); return; @@ -111,27 +107,27 @@ void KCsvProgressDlg::performExport(void) qfile.close(); m_qlabelAccount->setText(m_mymoneyaccount->name()); - m_qlabelTransaction->setText(QString("0") + i18n(" of ") + QString::number(m_mymoneyaccount->transactionCount())); + m_qlabelTransaction->setText(TQString("0") + i18n(" of ") + TQString::number(m_mymoneyaccount->transactionCount())); m_qprogressbar->setTotalSteps(m_mymoneyaccount->transactionCount()); // Make sure we have an account to operate on if (m_mymoneyaccount) { // Connect to the provided signals in MyMoneyAccount // These signals will be emitted at appropriate times. - connect(m_mymoneyaccount, SIGNAL(signalProgressCount(int)), m_qprogressbar, SLOT(setTotalSteps(int))); - connect(m_mymoneyaccount, SIGNAL(signalProgress(int)), this, SLOT(slotSetProgress(int))); + connect(m_mymoneyaccount, TQT_SIGNAL(signalProgressCount(int)), m_qprogressbar, TQT_SLOT(setTotalSteps(int))); + connect(m_mymoneyaccount, TQT_SIGNAL(signalProgress(int)), this, TQT_SLOT(slotSetProgress(int))); int nTransCount = 0; // Do the actual write - if (!m_mymoneyaccount->writeCSVFile(m_qlineeditFile->text(), m_kmymoneydateStart->getQDate(), - m_kmymoneydateEnd->getQDate(), nTransCount)) { + if (!m_mymoneyaccount->writeCSVFile(m_qlineeditFile->text(), m_kmymoneydateStart->getTQDate(), + m_kmymoneydateEnd->getTQDate(), nTransCount)) { KMessageBox::error(this, i18n("Error occurred whilst exporting to csv file."), i18n("Export CSV")); } else { - QString qstringPrompt = i18n("Export finished successfully.\n\n"); + TQString qstringPrompt = i18n("Export finished successfully.\n\n"); qstringPrompt += i18n("Number of transactions exported "); - qstringPrompt += QString::number(nTransCount); + qstringPrompt += TQString::number(nTransCount); qstringPrompt += "."; KMessageBox::information(this, qstringPrompt, i18n("Export CSV")); } @@ -150,7 +146,7 @@ void KCsvProgressDlg::performImport(void) return; } - QFile qfile(m_qlineeditFile->text()); + TQFile qfile(m_qlineeditFile->text()); if (!qfile.open(IO_ReadOnly)) { KMessageBox::error(this, i18n("Unable to open import file for reading.")); return; @@ -163,8 +159,8 @@ void KCsvProgressDlg::performImport(void) if (m_mymoneyaccount) { // Connect to the provided signals in MyMoneyAccount // These signals will be emitted at appropriate times. - connect(m_mymoneyaccount, SIGNAL(signalProgressCount(int)), m_qprogressbar, SLOT(setTotalSteps(int))); - connect(m_mymoneyaccount, SIGNAL(signalProgress(int)), this, SLOT(slotSetProgress(int))); + connect(m_mymoneyaccount, TQT_SIGNAL(signalProgressCount(int)), m_qprogressbar, TQT_SLOT(setTotalSteps(int))); + connect(m_mymoneyaccount, TQT_SIGNAL(signalProgress(int)), this, TQT_SLOT(slotSetProgress(int))); int nTransCount = 0; @@ -173,9 +169,9 @@ void KCsvProgressDlg::performImport(void) KMessageBox::error(this, i18n("Error occurred whilst importing csv file."), i18n("Import CSV")); } else { - QString qstringPrompt = i18n("Import finished successfully.\n\n"); + TQString qstringPrompt = i18n("Import finished successfully.\n\n"); qstringPrompt += i18n("Number of transactions imported "); - qstringPrompt += QString::number(nTransCount); + qstringPrompt += TQString::number(nTransCount); qstringPrompt += "."; KMessageBox::information(this, qstringPrompt, i18n("Import CSV")); } @@ -186,7 +182,7 @@ void KCsvProgressDlg::performImport(void) /** Called when the user clicks on the Browser button */ void KCsvProgressDlg::slotBrowseClicked() { - QString newName = KFileDialog::getSaveFileName(QString::null,"*.CSV"); + TQString newName = KFileDialog::getSaveFileName(TQString(),"*.CSV"); if (!newName.isEmpty()) { m_qlineeditFile->setText(newName); @@ -207,7 +203,7 @@ void KCsvProgressDlg::slotRunClicked() } /** Make sure the text input is ok */ -void KCsvProgressDlg::slotFileTextChanged(const QString& text) +void KCsvProgressDlg::slotFileTextChanged(const TQString& text) { if (!text.isEmpty()) { m_qlineeditFile->setText(text); @@ -234,8 +230,8 @@ void KCsvProgressDlg::writeConfig(void) KConfig *kconfig = KGlobal::config(); kconfig->setGroup("Last Use Settings"); kconfig->writeEntry("KCsvProgressDlg_LastFile", m_qlineeditFile->text()); - kconfig->writeEntry("KCsvProgressDlg_StartDate", QDateTime(m_kmymoneydateStart->date())); - kconfig->writeEntry("KCsvProgressDlg_EndDate", QDateTime(m_kmymoneydateEnd->date())); + kconfig->writeEntry("KCsvProgressDlg_StartDate", TQDateTime(m_kmymoneydateStart->date())); + kconfig->writeEntry("KCsvProgressDlg_EndDate", TQDateTime(m_kmymoneydateEnd->date())); kconfig->sync(); } @@ -243,9 +239,9 @@ void KCsvProgressDlg::writeConfig(void) void KCsvProgressDlg::slotSetProgress(int progress) { m_qprogressbar->setProgress(progress); - QString qstring = QString::number(progress); + TQString qstring = TQString::number(progress); qstring += i18n(" of "); - qstring += QString::number(m_qprogressbar->totalSteps()); + qstring += TQString::number(m_qprogressbar->totalSteps()); m_qlabelTransaction->setText(qstring); } diff --git a/kmymoney2/dialogs/kcsvprogressdlg.h b/kmymoney2/dialogs/kcsvprogressdlg.h index 339d210..20d6990 100644 --- a/kmymoney2/dialogs/kcsvprogressdlg.h +++ b/kmymoney2/dialogs/kcsvprogressdlg.h @@ -22,7 +22,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> +#include <tqwidget.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -44,6 +44,7 @@ **/ class KCsvProgressDlg : public KCsvProgressDlgDecl { Q_OBJECT + TQ_OBJECT private: MyMoneyAccount *m_mymoneyaccount; int m_nType; @@ -57,11 +58,11 @@ protected: protected slots: void slotBrowseClicked(); void slotRunClicked(); - void slotFileTextChanged(const QString& text); + void slotFileTextChanged(const TQString& text); void slotSetProgress(int progress); public: - KCsvProgressDlg(int type, MyMoneyAccount *account, QWidget *parent=0, const char *name=0); + KCsvProgressDlg(int type, MyMoneyAccount *account, TQWidget *tqparent=0, const char *name=0); ~KCsvProgressDlg(); }; diff --git a/kmymoney2/dialogs/kcsvprogressdlgdecl.ui b/kmymoney2/dialogs/kcsvprogressdlgdecl.ui index 4b1afd5..d7c0f20 100644 --- a/kmymoney2/dialogs/kcsvprogressdlgdecl.ui +++ b/kmymoney2/dialogs/kcsvprogressdlgdecl.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI> <class>KCsvProgressDlgDecl</class> <widget> - <class>QDialog</class> + <class>TQDialog</class> <property stdset="1"> <name>name</name> <cstring>kcsvprogressdlgdecl</cstring> @@ -20,7 +20,7 @@ <number>6</number> </property> <widget> - <class>QLayoutWidget</class> + <class>TQLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout7</cstring> @@ -35,7 +35,7 @@ <number>6</number> </property> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>TextLabel2_2</cstring> @@ -62,7 +62,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </property> </widget> <widget> - <class>QLayoutWidget</class> + <class>TQLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout20</cstring> @@ -77,7 +77,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <number>6</number> </property> <widget> - <class>QLayoutWidget</class> + <class>TQLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout19</cstring> @@ -92,7 +92,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <number>6</number> </property> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>TextLabel1_2</cstring> @@ -103,7 +103,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </property> </widget> <widget> - <class>QLayoutWidget</class> + <class>TQLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout18</cstring> @@ -118,14 +118,14 @@ You can cancel the process at any time by clicking on the Cancel button.</string <number>6</number> </property> <widget> - <class>QLineEdit</class> + <class>TQLineEdit</class> <property stdset="1"> <name>name</name> <cstring>m_qlineeditFile</cstring> </property> </widget> <widget> - <class>QPushButton</class> + <class>TQPushButton</class> <property stdset="1"> <name>name</name> <cstring>m_qbuttonBrowse</cstring> @@ -140,7 +140,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </vbox> </widget> <widget> - <class>QGroupBox</class> + <class>TQGroupBox</class> <property stdset="1"> <name>name</name> <cstring>m_qgroupboxDates</cstring> @@ -159,7 +159,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <number>6</number> </property> <widget> - <class>QLayoutWidget</class> + <class>TQLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout8</cstring> @@ -174,7 +174,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <number>6</number> </property> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>lblStartDate</cstring> @@ -187,7 +187,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </sizepolicy> </property> <property stdset="1"> - <name>minimumSize</name> + <name>tqminimumSize</name> <size> <width>50</width> <height>0</height> @@ -215,7 +215,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </hbox> </widget> <widget> - <class>QLayoutWidget</class> + <class>TQLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout7_2</cstring> @@ -230,7 +230,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <number>6</number> </property> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>lblEndDate</cstring> @@ -243,7 +243,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </sizepolicy> </property> <property stdset="1"> - <name>minimumSize</name> + <name>tqminimumSize</name> <size> <width>50</width> <height>0</height> @@ -275,7 +275,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </hbox> </widget> <widget> - <class>QLayoutWidget</class> + <class>TQLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout7</cstring> @@ -303,7 +303,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> @@ -311,7 +311,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </property> </spacer> <widget> - <class>QPushButton</class> + <class>TQPushButton</class> <property stdset="1"> <name>name</name> <cstring>m_qbuttonRun</cstring> @@ -328,7 +328,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </hbox> </widget> <widget> - <class>QGroupBox</class> + <class>TQGroupBox</class> <property stdset="1"> <name>name</name> <cstring>m_qgroupbox</cstring> @@ -351,7 +351,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <number>6</number> </property> <widget> - <class>QLayoutWidget</class> + <class>TQLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout2</cstring> @@ -366,7 +366,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <number>6</number> </property> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>TextLabel2</cstring> @@ -377,7 +377,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </property> </widget> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>m_qlabelAccount</cstring> @@ -387,7 +387,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <string>Unknown</string> </property> <property stdset="1"> - <name>alignment</name> + <name>tqalignment</name> <set>AlignVCenter|AlignRight</set> </property> <property> @@ -397,7 +397,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </hbox> </widget> <widget> - <class>QLayoutWidget</class> + <class>TQLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout1</cstring> @@ -412,7 +412,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <number>6</number> </property> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>TextLabel3</cstring> @@ -423,7 +423,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </property> </widget> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>m_qlabelTransaction</cstring> @@ -433,7 +433,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <string>0 of 0</string> </property> <property stdset="1"> - <name>alignment</name> + <name>tqalignment</name> <set>AlignVCenter|AlignRight</set> </property> <property> @@ -443,7 +443,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </hbox> </widget> <widget> - <class>QProgressBar</class> + <class>TQProgressBar</class> <property stdset="1"> <name>name</name> <cstring>m_qprogressbar</cstring> @@ -456,7 +456,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </vbox> </widget> <widget> - <class>QLayoutWidget</class> + <class>TQLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout3</cstring> @@ -484,7 +484,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> @@ -492,7 +492,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </property> </spacer> <widget> - <class>QPushButton</class> + <class>TQPushButton</class> <property stdset="1"> <name>name</name> <cstring>m_qbuttonOk</cstring> diff --git a/kmymoney2/dialogs/kcurrencycalculator.cpp b/kmymoney2/dialogs/kcurrencycalculator.cpp index 6e674dc..0457a98 100644 --- a/kmymoney2/dialogs/kcurrencycalculator.cpp +++ b/kmymoney2/dialogs/kcurrencycalculator.cpp @@ -23,11 +23,11 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlabel.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qwidgetstack.h> -#include <qgroupbox.h> +#include <tqlabel.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqwidgetstack.h> +#include <tqgroupbox.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -51,7 +51,7 @@ #include "../kmymoneyutils.h" -bool KCurrencyCalculator::setupSplitPrice(MyMoneyMoney& shares, const MyMoneyTransaction& t, const MyMoneySplit& s, const QMap<QString, MyMoneyMoney>& priceInfo, QWidget* parentWidget) +bool KCurrencyCalculator::setupSplitPrice(MyMoneyMoney& shares, const MyMoneyTransaction& t, const MyMoneySplit& s, const TQMap<TQString, MyMoneyMoney>& priceInfo, TQWidget* tqparentWidget) { bool rc = true; MyMoneyFile* file = MyMoneyFile::instance(); @@ -72,7 +72,7 @@ bool KCurrencyCalculator::setupSplitPrice(MyMoneyMoney& shares, const MyMoneyTra fromValue = s.value().abs(); // if we had a price info in the beginning, we use it here - if(priceInfo.find(cat.currencyId()) != priceInfo.end()) { + if(priceInfo.tqfind(cat.currencyId()) != priceInfo.end()) { toValue = (fromValue * priceInfo[cat.currencyId()]).convert(fract); } @@ -95,9 +95,9 @@ bool KCurrencyCalculator::setupSplitPrice(MyMoneyMoney& shares, const MyMoneyTra toValue, t.postDate(), fract, - parentWidget, "currencyCalculator"); + tqparentWidget, "currencyCalculator"); - if(calc.exec() == QDialog::Rejected) { + if(calc.exec() == TQDialog::Rejected) { rc = false; } else shares = (s.value() * calc.price()).convert(fract); @@ -111,8 +111,8 @@ bool KCurrencyCalculator::setupSplitPrice(MyMoneyMoney& shares, const MyMoneyTra return rc; } -KCurrencyCalculator::KCurrencyCalculator(const MyMoneySecurity& from, const MyMoneySecurity& to, const MyMoneyMoney& value, const MyMoneyMoney& shares, const QDate& date, const signed64 resultFraction, QWidget *parent, const char *name ) : - KCurrencyCalculatorDecl(parent, name), +KCurrencyCalculator::KCurrencyCalculator(const MyMoneySecurity& from, const MyMoneySecurity& to, const MyMoneyMoney& value, const MyMoneyMoney& shares, const TQDate& date, const signed64 resultFraction, TQWidget *tqparent, const char *name ) : + KCurrencyCalculatorDecl(tqparent, name), m_fromCurrency(from), m_toCurrency(to), m_result(shares.abs()), @@ -125,7 +125,7 @@ KCurrencyCalculator::KCurrencyCalculator(const MyMoneySecurity& from, const MyMo if(date.isValid()) m_dateEdit->setDate(date); else - m_dateEdit->setDate(QDate::currentDate()); + m_dateEdit->setDate(TQDate::tqcurrentDate()); m_fromCurrencyText->setText(m_fromCurrency.isCurrency() ? m_fromCurrency.id() : m_fromCurrency.tradingSymbol()); m_toCurrencyText->setText(m_toCurrency.isCurrency() ? m_toCurrency.id() : m_toCurrency.tradingSymbol()); @@ -157,13 +157,13 @@ KCurrencyCalculator::KCurrencyCalculator(const MyMoneySecurity& from, const MyMo m_conversionRate->setPrecision(KMyMoneyGlobalSettings::pricePrecision()); - connect(m_amountButton, SIGNAL(clicked()), this, SLOT(slotSetToAmount())); - connect(m_rateButton, SIGNAL(clicked()), this, SLOT(slotSetExchangeRate())); + connect(m_amountButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetToAmount())); + connect(m_rateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetExchangeRate())); - connect(m_toAmount, SIGNAL(valueChanged(const QString&)), this, SLOT(slotUpdateResult(const QString&))); - connect(m_conversionRate, SIGNAL(valueChanged(const QString&)), this, SLOT(slotUpdateRate(const QString&))); - connect(m_cancelButton, SIGNAL(clicked()), this, SLOT(reject())); - connect(m_okButton, SIGNAL(clicked()), this, SLOT(accept())); + connect(m_toAmount, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotUpdateResult(const TQString&))); + connect(m_conversionRate, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotUpdateRate(const TQString&))); + connect(m_cancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(m_okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); // use this as the default m_amountButton->animateClick(); @@ -204,14 +204,14 @@ void KCurrencyCalculator::slotSetExchangeRate(void) m_conversionRate->setEnabled(true); } -void KCurrencyCalculator::slotUpdateResult(const QString& /*txt*/) +void KCurrencyCalculator::slotUpdateResult(const TQString& /*txt*/) { MyMoneyMoney result = m_toAmount->value(); MyMoneyMoney price(0, 1); if(result.isNegative()) { m_toAmount->setValue(-result); - slotUpdateResult(QString()); + slotUpdateResult(TQString()); return; } @@ -225,13 +225,13 @@ void KCurrencyCalculator::slotUpdateResult(const QString& /*txt*/) updateExample(price); } -void KCurrencyCalculator::slotUpdateRate(const QString& /*txt*/) +void KCurrencyCalculator::slotUpdateRate(const TQString& /*txt*/) { MyMoneyMoney price = m_conversionRate->value(); if(price.isNegative()) { m_conversionRate->setValue(-price); - slotUpdateRate(QString()); + slotUpdateRate(TQString()); return; } @@ -245,24 +245,24 @@ void KCurrencyCalculator::slotUpdateRate(const QString& /*txt*/) void KCurrencyCalculator::updateExample(const MyMoneyMoney& price) { - QString msg; + TQString msg; if(price.isZero()) { - msg = QString("1 %1 = ? %2").arg(m_fromCurrency.tradingSymbol()) - .arg(m_toCurrency.tradingSymbol()); + msg = TQString("1 %1 = ? %2").tqarg(m_fromCurrency.tradingSymbol()) + .tqarg(m_toCurrency.tradingSymbol()); if(m_fromCurrency.isCurrency()) { - msg += QString("\n"); - msg += QString("1 %1 = ? %2").arg(m_toCurrency.tradingSymbol()) - .arg(m_fromCurrency.tradingSymbol()); + msg += TQString("\n"); + msg += TQString("1 %1 = ? %2").tqarg(m_toCurrency.tradingSymbol()) + .tqarg(m_fromCurrency.tradingSymbol()); } } else { - msg = QString("1 %1 = %2 %3").arg(m_fromCurrency.tradingSymbol()) - .arg(price.formatMoney("", KMyMoneyGlobalSettings::pricePrecision())) - .arg(m_toCurrency.tradingSymbol()); + msg = TQString("1 %1 = %2 %3").tqarg(m_fromCurrency.tradingSymbol()) + .tqarg(price.formatMoney("", KMyMoneyGlobalSettings::pricePrecision())) + .tqarg(m_toCurrency.tradingSymbol()); if(m_fromCurrency.isCurrency()) { - msg += QString("\n"); - msg += QString("1 %1 = %2 %3").arg(m_toCurrency.tradingSymbol()) - .arg((MyMoneyMoney(1,1)/price).formatMoney("", KMyMoneyGlobalSettings::pricePrecision())) - .arg(m_fromCurrency.tradingSymbol()); + msg += TQString("\n"); + msg += TQString("1 %1 = %2 %3").tqarg(m_toCurrency.tradingSymbol()) + .tqarg((MyMoneyMoney(1,1)/price).formatMoney("", KMyMoneyGlobalSettings::pricePrecision())) + .tqarg(m_fromCurrency.tradingSymbol()); } } m_conversionExample->setText(msg); @@ -272,9 +272,9 @@ void KCurrencyCalculator::updateExample(const MyMoneyMoney& price) void KCurrencyCalculator::accept(void) { if(m_conversionRate->isEnabled()) - slotUpdateRate(QString()); + slotUpdateRate(TQString()); else - slotUpdateResult(QString()); + slotUpdateResult(TQString()); if(m_updateButton->isChecked()) { MyMoneyPrice pr = MyMoneyFile::instance()->price(m_fromCurrency.id(), m_toCurrency.id(), m_dateEdit->date()); diff --git a/kmymoney2/dialogs/kcurrencycalculator.h b/kmymoney2/dialogs/kcurrencycalculator.h index d9934da..a301129 100644 --- a/kmymoney2/dialogs/kcurrencycalculator.h +++ b/kmymoney2/dialogs/kcurrencycalculator.h @@ -26,7 +26,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> +#include <tqwidget.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -44,6 +44,7 @@ class KCurrencyCalculator : public KCurrencyCalculatorDecl { Q_OBJECT + TQ_OBJECT public: /** @@ -53,19 +54,19 @@ public: * @param shares the number of foreign currency units * @param date the date when the conversion took place * @param resultFraction the smallest fraction of the result (default 100) - * @param parent see QWidget constructor - * @param name see QWidget constructor + * @param tqparent see TQWidget constructor + * @param name see TQWidget constructor * * @note @p value must not be 0! */ - KCurrencyCalculator(const MyMoneySecurity& from, const MyMoneySecurity& to, const MyMoneyMoney& value, const MyMoneyMoney& shares, const QDate& date, const signed64 resultFraction = 100, QWidget *parent=0, const char *name=0); + KCurrencyCalculator(const MyMoneySecurity& from, const MyMoneySecurity& to, const MyMoneyMoney& value, const MyMoneyMoney& shares, const TQDate& date, const signed64 resultFraction = 100, TQWidget *tqparent=0, const char *name=0); ~KCurrencyCalculator(); const MyMoneyMoney price(void) const; void setupPriceEditor(void); - static bool setupSplitPrice(MyMoneyMoney& shares, const MyMoneyTransaction& t, const MyMoneySplit& s, const QMap<QString, MyMoneyMoney>& priceInfo, QWidget* parentWidget); + static bool setupSplitPrice(MyMoneyMoney& shares, const MyMoneyTransaction& t, const MyMoneySplit& s, const TQMap<TQString, MyMoneyMoney>& priceInfo, TQWidget* tqparentWidget); protected: void updateExample(const MyMoneyMoney& price); @@ -73,8 +74,8 @@ protected: protected slots: void slotSetToAmount(void); void slotSetExchangeRate(void); - void slotUpdateResult(const QString& txt); - void slotUpdateRate(const QString& txt); + void slotUpdateResult(const TQString& txt); + void slotUpdateRate(const TQString& txt); virtual void accept(void); private: diff --git a/kmymoney2/dialogs/kcurrencycalculatordecl.ui b/kmymoney2/dialogs/kcurrencycalculatordecl.ui index 688a282..16a8c3f 100644 --- a/kmymoney2/dialogs/kcurrencycalculatordecl.ui +++ b/kmymoney2/dialogs/kcurrencycalculatordecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KCurrencyCalculatorDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KCurrencyCalculatorDecl</cstring> </property> @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_amountDateFrame</cstring> </property> @@ -42,15 +42,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -58,7 +58,7 @@ <string>Amount</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_fromAmount</cstring> </property> @@ -76,14 +76,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -91,7 +91,7 @@ <string>Date</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_dateText</cstring> </property> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>145</width> <height>20</height> @@ -120,15 +120,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2_2</cstring> </property> @@ -142,7 +142,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_fromType</cstring> </property> @@ -150,20 +150,20 @@ <string>Currency</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_fromCurrencyText</cstring> </property> <property name="text"> <string>xxx</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -177,7 +177,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_toType</cstring> </property> @@ -185,14 +185,14 @@ <string>Currency</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_toCurrencyText</cstring> </property> <property name="text"> <string>xxx</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -200,9 +200,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <grid> <property name="name"> @@ -213,7 +213,7 @@ <cstring>m_conversionRate</cstring> </property> </widget> - <widget class="QButtonGroup" row="0" column="0" rowspan="3" colspan="1"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="3" colspan="1"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -239,7 +239,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_amountButton</cstring> </property> @@ -247,7 +247,7 @@ <string>To amount</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_rateButton</cstring> </property> @@ -257,7 +257,7 @@ </widget> </vbox> </widget> - <widget class="QFrame" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQFrame" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_dateFrame</cstring> </property> @@ -277,7 +277,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -292,7 +292,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_conversionExample</cstring> </property> @@ -308,7 +308,7 @@ xx</string> </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_updateButton</cstring> </property> @@ -329,7 +329,7 @@ xx</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -350,9 +350,9 @@ xx</string> <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -368,7 +368,7 @@ xx</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -410,5 +410,9 @@ xx</string> <tabstop>m_okButton</tabstop> <tabstop>m_cancelButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kcurrencyeditdlg.cpp b/kmymoney2/dialogs/kcurrencyeditdlg.cpp index 55bac30..aad8f20 100644 --- a/kmymoney2/dialogs/kcurrencyeditdlg.cpp +++ b/kmymoney2/dialogs/kcurrencyeditdlg.cpp @@ -25,13 +25,13 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qheader.h> -#include <qtimer.h> +#include <tqheader.h> +#include <tqtimer.h> -#include <qpixmap.h> -#include <qbitmap.h> -#include <qlabel.h> -#include <qgroupbox.h> +#include <tqpixmap.h> +#include <tqbitmap.h> +#include <tqlabel.h> +#include <tqgroupbox.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -56,8 +56,8 @@ #include "../widgets/kmymoneypriceview.h" -KCurrencyEditDlg::KCurrencyEditDlg(QWidget *parent, const char *name ) : - KCurrencyEditDlgDecl(parent,name) +KCurrencyEditDlg::KCurrencyEditDlg(TQWidget *tqparent, const char *name ) : + KCurrencyEditDlgDecl(tqparent,name) { m_currencyList->addColumn(i18n("Currency")); m_currencyList->header()->hide(); @@ -65,18 +65,18 @@ KCurrencyEditDlg::KCurrencyEditDlg(QWidget *parent, const char *name ) : // FIXME: the online source table currently has no functionality m_onlineSourceTable->hide(); - connect(m_currencyList, SIGNAL(rightButtonPressed(QListViewItem* , const QPoint&, int)), - this, SLOT(slotListClicked(QListViewItem*, const QPoint&, int))); - connect(m_currencyList, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotSelectCurrency(QListViewItem*))); + connect(m_currencyList, TQT_SIGNAL(rightButtonPressed(TQListViewItem* , const TQPoint&, int)), + this, TQT_SLOT(slotListClicked(TQListViewItem*, const TQPoint&, int))); + connect(m_currencyList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectCurrency(TQListViewItem*))); - connect(m_currencyList, SIGNAL(itemRenamed(QListViewItem*,int,const QString&)), this, SIGNAL(renameCurrency(QListViewItem*,int,const QString&))); - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotLoadCurrencies())); + connect(m_currencyList, TQT_SIGNAL(itemRenamed(TQListViewItem*,int,const TQString&)), this, TQT_SIGNAL(renameCurrency(TQListViewItem*,int,const TQString&))); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadCurrencies())); slotLoadCurrencies(); - connect(m_baseCurrencyButton, SIGNAL(clicked()), this, SLOT(slotSelectBaseCurrency())); - connect(buttonClose, SIGNAL(clicked()), this, SLOT(slotClose())); + connect(m_baseCurrencyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectBaseCurrency())); + connect(buttonClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); // FIXME: currently, no online help available buttonHelp->hide(); @@ -85,14 +85,14 @@ KCurrencyEditDlg::KCurrencyEditDlg(QWidget *parent, const char *name ) : m_description->hide(); resize(width()-1, height()-1); - QTimer::singleShot(10, this, SLOT(timerDone())); + TQTimer::singleShot(10, this, TQT_SLOT(timerDone())); } void KCurrencyEditDlg::timerDone(void) { if(!m_currency.id().isEmpty()) { - QListViewItemIterator it(m_currencyList); - QListViewItem* q; + TQListViewItemIterator it(m_currencyList); + TQListViewItem* q; while((q = it.current()) != 0) { KMyMoneyListViewItem* p = static_cast<KMyMoneyListViewItem *>(q); if(p->id() == m_currency.id()) { @@ -113,7 +113,7 @@ KCurrencyEditDlg::~KCurrencyEditDlg() { } -void KCurrencyEditDlg::resizeEvent(QResizeEvent* /* e*/) +void KCurrencyEditDlg::resizeEvent(TQResizeEvent* /* e*/) { int w = m_currencyList->visibleWidth(); @@ -122,25 +122,25 @@ void KCurrencyEditDlg::resizeEvent(QResizeEvent* /* e*/) void KCurrencyEditDlg::slotLoadCurrencies(void) { - QValueList<MyMoneySecurity> list = MyMoneyFile::instance()->currencyList(); - QValueList<MyMoneySecurity>::ConstIterator it; - QListViewItem *first = 0; + TQValueList<MyMoneySecurity> list = MyMoneyFile::instance()->currencyList(); + TQValueList<MyMoneySecurity>::ConstIterator it; + TQListViewItem *first = 0; - QString localCurrency(localeconv()->int_curr_symbol); + TQString localCurrency(localeconv()->int_curr_symbol); localCurrency.truncate(3); - QString baseCurrency = MyMoneyFile::instance()->baseCurrency().id(); + TQString baseCurrency = MyMoneyFile::instance()->baseCurrency().id(); // construct a transparent 16x16 pixmap - QPixmap empty(16, 16); - empty.setMask(QBitmap(16, 16, true)); + TQPixmap empty(16, 16); + empty.setMask(TQBitmap(16, 16, true)); m_currencyList->clear(); for(it = list.begin(); it != list.end(); ++it) { - KMyMoneyListViewItem* p = new KMyMoneyListViewItem(m_currencyList, (*it).name(), QString(), (*it).id()); + KMyMoneyListViewItem* p = new KMyMoneyListViewItem(m_currencyList, (*it).name(), TQString(), (*it).id()); p->setRenameEnabled(0, true); if((*it).id() == baseCurrency) { - p->setPixmap(0, QPixmap( locate("icon","hicolor/16x16/apps/kmymoney2.png"))); + p->setPixmap(0, TQPixmap( locate("icon","hicolor/16x16/apps/kmymoney2.png"))); if(m_currency.id().isEmpty()) first = p; } else { @@ -182,9 +182,9 @@ void KCurrencyEditDlg::updateCurrency(void) } } -void KCurrencyEditDlg::slotSelectCurrency(const QString& id) +void KCurrencyEditDlg::slotSelectCurrency(const TQString& id) { - QListViewItemIterator it(m_currencyList); + TQListViewItemIterator it(m_currencyList); while(it.current()) { KMyMoneyListViewItem* p = static_cast<KMyMoneyListViewItem*>(it.current()); @@ -198,17 +198,17 @@ void KCurrencyEditDlg::slotSelectCurrency(const QString& id) } } -void KCurrencyEditDlg::slotSelectCurrency(QListViewItem *item) +void KCurrencyEditDlg::slotSelectCurrency(TQListViewItem *item) { - QMap<QDate, MyMoneyMoney> history; + TQMap<TQDate, MyMoneyMoney> history; MyMoneyFile* file = MyMoneyFile::instance(); updateCurrency(); m_detailGroup->setEnabled(item != 0); m_onlineSourceTable->clear(); - m_idLabel->setText(QString()); - m_symbolEdit->setText(QString()); + m_idLabel->setText(TQString()); + m_symbolEdit->setText(TQString()); if(item) { try { @@ -221,8 +221,8 @@ void KCurrencyEditDlg::slotSelectCurrency(QListViewItem *item) delete e; m_currency = MyMoneySecurity(); m_onlineSourceTable->clear(); - m_idLabel->setText(QString()); - m_symbolEdit->setText(QString()); + m_idLabel->setText(TQString()); + m_symbolEdit->setText(TQString()); } m_baseCurrencyButton->setDisabled(m_currency.id() == file->baseCurrency().id()); emit selectObject(m_currency); @@ -237,20 +237,20 @@ void KCurrencyEditDlg::slotClose(void) void KCurrencyEditDlg::slotStartRename(void) { - QListViewItemIterator it_l(m_currencyList, QListViewItemIterator::Selected); - QListViewItem* it_v; + TQListViewItemIterator it_l(m_currencyList, TQListViewItemIterator::Selected); + TQListViewItem* it_v; if((it_v = it_l.current()) != 0) { it_v->startRename(0); } } -void KCurrencyEditDlg::slotListClicked(QListViewItem* item, const QPoint&, int) +void KCurrencyEditDlg::slotListClicked(TQListViewItem* item, const TQPoint&, int) { slotSelectCurrency(item); emit openContextMenu(m_currency); } -void KCurrencyEditDlg::slotRenameCurrency(QListViewItem* item, int /* col */, const QString& txt) +void KCurrencyEditDlg::slotRenameCurrency(TQListViewItem* item, int /* col */, const TQString& txt) { MyMoneyFile* file = MyMoneyFile::instance(); KMyMoneyListViewItem* p = static_cast<KMyMoneyListViewItem *>(item); @@ -279,7 +279,7 @@ void KCurrencyEditDlg::slotRenameCurrency(QListViewItem* item, int /* col */, co void KCurrencyEditDlg::slotSelectBaseCurrency(void) { if(!m_currency.id().isEmpty()) { - QListViewItem* p = m_currencyList->selectedItem(); + TQListViewItem* p = m_currencyList->selectedItem(); emit selectBaseCurrency(m_currency); // in case the dataChanged() signal was not sent out (nested FileTransaction) // we update the list manually diff --git a/kmymoney2/dialogs/kcurrencyeditdlg.h b/kmymoney2/dialogs/kcurrencyeditdlg.h index f1a4871..5a1e00f 100644 --- a/kmymoney2/dialogs/kcurrencyeditdlg.h +++ b/kmymoney2/dialogs/kcurrencyeditdlg.h @@ -26,7 +26,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> +#include <tqwidget.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -46,25 +46,26 @@ class KPopupMenu; class KCurrencyEditDlg : public KCurrencyEditDlgDecl { Q_OBJECT + TQ_OBJECT public: - KCurrencyEditDlg(QWidget *parent=0, const char *name=0); + KCurrencyEditDlg(TQWidget *tqparent=0, const char *name=0); ~KCurrencyEditDlg(); public slots: - void slotSelectCurrency(const QString& id); + void slotSelectCurrency(const TQString& id); protected: /// the resize event - virtual void resizeEvent(QResizeEvent*); + virtual void resizeEvent(TQResizeEvent*); void updateCurrency(void); protected slots: - void slotSelectCurrency(QListViewItem *); + void slotSelectCurrency(TQListViewItem *); void slotClose(void); void slotStartRename(void); - void slotListClicked(QListViewItem* item, const QPoint&, int); - void slotRenameCurrency(QListViewItem* item, int col, const QString& txt); + void slotListClicked(TQListViewItem* item, const TQPoint&, int); + void slotRenameCurrency(TQListViewItem* item, int col, const TQString& txt); void slotLoadCurrencies(void); private slots: @@ -74,7 +75,7 @@ private slots: signals: void selectObject(const MyMoneySecurity& currency); void openContextMenu(const MyMoneySecurity& currency); - void renameCurrency(QListViewItem* item, int, const QString& txt); + void renameCurrency(TQListViewItem* item, int, const TQString& txt); void selectBaseCurrency(const MyMoneySecurity& currency); private: diff --git a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui index 4a0a740..6c4a50c 100644 --- a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui +++ b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KCurrencyEditDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KCurrencyEditDlgDecl</cstring> </property> @@ -22,17 +22,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> @@ -43,7 +43,7 @@ <cstring>m_currencyList</cstring> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_baseCurrencyFrame</cstring> </property> @@ -60,9 +60,9 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>21</height> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>31</height> @@ -116,7 +116,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_detailGroup</cstring> </property> @@ -127,15 +127,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -143,7 +143,7 @@ <string>Symbol</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_idLabel</cstring> </property> @@ -156,7 +156,7 @@ <cstring>m_symbolEdit</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -166,7 +166,7 @@ </widget> </grid> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_description</cstring> </property> @@ -205,7 +205,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -219,7 +219,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -246,14 +246,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonClose</cstring> </property> @@ -300,5 +300,5 @@ <data format="PNG" length="1114">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042149444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d096e8b11261871837bc8e282ac7ac82187e049a317e32d37110992bf42123c694eea414c0e0bf1b0ec6c402139485a54e8810c54c10e741146fa110bd643f74c12bd642e4d75f77cf5d5ef7dafdfc2ce7087d9eff32fdfdff74e5114104011e489d6e952cce5cfbe5998692dec0c77b87aedd3fddd9f2b3efce02291082209aa3504685022e4ffd7a000a82a765c515615ce95acae659c3f7765c100ec6e575cf8f822e991025f3b6a6f890c484f181ccfc1583428f5d4e2fe84da039aa04121b40eb32483a0ec6e5bce9f8385d36fa7fb9b1b17c8f31cbfe7a95c45be94520c72b2141a1caa160d1666e24ea94aa11ee7685054159d2ada34d41387c40dc63b8844f0b5c73a4bb19cb3f9de001f2aac1fa23aa209168c004224902e29d22ff1e38abbdb275055c4800610233867311a1491847a62c98f66ac6f14d8e99072f22daa15b68a8108424d6422e24c88e3966fbce4c9d786945b27f0be0103ed13c16004d59a2c4d58df28a87548e9aee2274ab95d60c7193c9a0281fc959ae2a4450364a9e2572c7a2b43438374ef2dd2154012d050514dbec7396578a3130d9d6850066f0ad9d186f2d78cdbbb799b0a202f2c48d3aebbb418310240b112637588574bf54b8efaa4fd9b691dacbf5b305813542bae63a9eee4c4694d967b5494eca8c7ef0933bdc5d90e6a2caa0e3f013b7adce9fa5b03d637561113a30106a71d18c5fd9677058338ad01e91c0b8b743b880182ce19cd9c0e5e2b583fbdda565d3d04cfedad180942133af201b2bc3588e111c680068f489780ce69b192b279768088524f2b3458ea694d3de99a4323bc976ed34eb86b98c51993f6be10f77240c99685cd731991f1582df15aa15a213d583f5313a7806988fb8a0640e336359d9e9933568bf44062214ba19e2a7652a13d8b068ff596b807182189234e9da9f1ceb78c81b28c3ac6fe21e306c58e41d5118952acd6a0c2f56b9e6a5c72f346cdcd6b19a3bf8010010d714f89533b674c90c7189b598eab12a45fb5c75b8253672b863fbcccf5af93b6904119fe9851bf5153ac3a746ae7b9d5698c1dc58f313e70e4707ce9d84bafa2f79fc23fb8c7c1438ef04031a2642fee21060ec69ee47020796ecaa12313ccd333d1b67935047acf2be3bb11aa010dbe656cc755dbe3b772084a7ebc6d5711253b593dfcc0cc8fcd3cafda455512c7f200ec56cbfac0f1d7d34b7fdf0f98fd88a92a7e9cb0e70cc933c0b38a2c823ea0bd76c70c016adb67f47bc2a117a6d40abeea33fa23c2fb867edfb413e4a34fded94ffb3991c46dc7754cd3634ad2af490b857f5a5137126a97e02a8120a485235b6a28ef80bd077ee2b9f2d54fed04595dcbd8ddb6c4bd87334c10cadb2064e856177e7864e669fbe1df154a0142839f7ad2e5b6880bff1da66eece78e315d959f609da670f98befe6c3f45fb42672c9acff7f660000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/keditequityentrydecl.ui b/kmymoney2/dialogs/keditequityentrydecl.ui index 4acf703..baa92c9 100644 --- a/kmymoney2/dialogs/keditequityentrydecl.ui +++ b/kmymoney2/dialogs/keditequityentrydecl.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KEditEquityEntryDecl</class> <author>Kevin Tambascio </author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KEditEquityEntryDecl</cstring> </property> @@ -23,9 +23,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> @@ -56,7 +56,7 @@ <cstring>cmbInvestmentType</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -64,15 +64,15 @@ <string>Smallest fraction:</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -87,7 +87,7 @@ <property name="text"> <string>1 /</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -98,7 +98,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblType</cstring> </property> @@ -106,7 +106,7 @@ <string>Investment Type:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblEquityName</cstring> </property> @@ -119,7 +119,7 @@ <cstring>edtMarketSymbol</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblSymbol</cstring> </property> @@ -129,7 +129,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -145,9 +145,9 @@ <cstring>kpvPriceHistory</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>21</height> @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>21</height> @@ -215,9 +215,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>238</width> <height>21</height> @@ -302,5 +302,5 @@ <data format="PNG" length="826">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000030149444154789cb59531681b5718c77f0e377c070e3c810a3a70e0041eac51852e0a19e45134830a1d9a4c69a04bc8928e990a693a640e1d0c8642b08742321894c1507991b484c890902bb8701a047760c3bd21701fe4201dde49b6a41a32b8df72dcbbeffdbefffbbfefbd5b1b0c07cce266ebe667ae2006c3c1dada0cdc3be87d6e6c35b0d692a409d9c7ec8b20d65ae29398d19b1114e7e3de4ce98b3f5e10dc0053cf0951b4506496e1b964bf7ce6c585d9054c62d01d617ca48be0596553cf496d8f2c8b01c5f795fc93904e85ec4c01a152857a5d9175d0b2805c872080f18595ccc1499a10a225d4e2fbc2877786fe81253ab6c04c8d106e09db5d43ab0d146e5c64d1a23938fb98a185cea1c33eecfd9eba49eb427dcb201e245365f2b7b2fb5b4a3a31dcb927178afe07d86901df870fefa4842aed6f6b74ba42e52b4014d580e1eb9cbd9d94de7e4aad16d2f9be02d805f0b5e532f927a1ffcacea1777f122a8105b164a7c25faf323a5d9f1f1fd600e1e5bec59e2d4b5c7ef5209d0ad17b8b31864e57c0b3e0815ac3ee33253ab664a770ff5185d1a1cb8d2267d3e58aa1dc7d2508cbe597d0e74fdd269aaaf0f52d414c4ea3e9762c996869e42560d7a72e41c4799a2586e74f95e8d8151481fa86efbe7b3398ac58b1a2b8527589f15451ad303ac2293542ad6648a796278f13a27185e4c4754310facb98c53a79e19a3fdc1426ff28c3d7399d1f7cb25343eb96106cf83c790ce9c4f2eb831855c55485663327992eb6dc8a6259874ed700b0b793323cccb9ffa842b30d6133e3e75fea989ac15a8b16ca76b746b0b92278d919774c5b6d48a78697fb29bbcf52468742a32120909c24e899ce67beed5be2db01e22d1e9485bb620e47f9ee9e606a21bd3f5d3744c7e7c54d55e87443867d8b554515ac5db4620e8e4f62263170fd1cdee90aad7640141992891b0f367c9adfe4049bb07d3b7022bd8c687c0978f46684ee084150b65ac1fcca94591b7a90a496e4c095164fb016a2b192a497795cc0f84817aebe25f7bf70ccc54a575c555c03f78ffa5fc0570d1f0c076bff0232285a0901e2257b0000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/keditequityentrydlg.cpp b/kmymoney2/dialogs/keditequityentrydlg.cpp index 854ce9a..ef9ed84 100644 --- a/kmymoney2/dialogs/keditequityentrydlg.cpp +++ b/kmymoney2/dialogs/keditequityentrydlg.cpp @@ -22,7 +22,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qtimer.h> +#include <tqtimer.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -40,27 +40,27 @@ #include "kupdatestockpricedlg.h" #include "../widgets/kmymoneypriceview.h" -KEditEquityEntryDlg::KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity, QWidget *parent, const char *name) - : KEditEquityEntryDecl(parent, name, true) +KEditEquityEntryDlg::KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity, TQWidget *tqparent, const char *name) + : KEditEquityEntryDecl(tqparent, name, true) { m_selectedSecurity = selectedSecurity; - connect(btnOK, SIGNAL(clicked()), this, SLOT(slotOKClicked())); - connect(btnCancel, SIGNAL(clicked()), this, SLOT(reject())); - connect(edtEquityName, SIGNAL(textChanged(const QString &)), this, SLOT(slotDataChanged())); - connect(edtMarketSymbol, SIGNAL(textChanged(const QString &)), this, SLOT(slotDataChanged())); - connect(edtFraction, SIGNAL(textChanged(const QString&)), this, SLOT(slotDataChanged())); - connect(btnAddEntry, SIGNAL(clicked()), kpvPriceHistory, SLOT(slotAddPrice())); - connect(btnEditEntry, SIGNAL(clicked()), kpvPriceHistory, SLOT(slotEditPrice())); - connect(btnRemoveEntry, SIGNAL(clicked()), kpvPriceHistory, SLOT(slotDeletePrice())); - connect(kpvPriceHistory, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotSelectionChanged(QListViewItem*))); + connect(btnOK, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOKClicked())); + connect(btnCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(edtEquityName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotDataChanged())); + connect(edtMarketSymbol, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotDataChanged())); + connect(edtFraction, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotDataChanged())); + connect(btnAddEntry, TQT_SIGNAL(clicked()), kpvPriceHistory, TQT_SLOT(slotAddPrice())); + connect(btnEditEntry, TQT_SIGNAL(clicked()), kpvPriceHistory, TQT_SLOT(slotEditPrice())); + connect(btnRemoveEntry, TQT_SIGNAL(clicked()), kpvPriceHistory, TQT_SLOT(slotDeletePrice())); + connect(kpvPriceHistory, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); //fill in the fields with what we know. edtEquityName->setText(m_selectedSecurity.name()); edtMarketSymbol->setText(m_selectedSecurity.tradingSymbol()); edtFraction->setPrecision(0); edtFraction->setCalculatorButtonVisible(false); - edtFraction->loadText(QString::number(m_selectedSecurity.smallestAccountFraction())); + edtFraction->loadText(TQString::number(m_selectedSecurity.smallestAccountFraction())); cmbInvestmentType->setCurrentItem((int)m_selectedSecurity.securityType()); // FIXME PRICE // kpvPriceHistory->setHistory(m_selectedSecurity.priceHistory()); @@ -73,7 +73,7 @@ KEditEquityEntryDlg::KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity btnAddEntry->setGuiItem(KStdGuiItem::add()); KGuiItem editButtenItem( i18n( "&Edit" ), - QIconSet(il->loadIcon("edit", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("edit", KIcon::Small, KIcon::SizeSmall)), i18n("Modify the selected entry"), i18n("Change the price information of the selected entry.")); btnEditEntry->setGuiItem(editButtenItem); @@ -82,9 +82,9 @@ KEditEquityEntryDlg::KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity slotDataChanged(); m_changes = false; - // force a resize to optimize the layout of all widgets + // force a resize to optimize the tqlayout of all widgets resize(width()-1, height()-1); - QTimer::singleShot(10, this, SLOT(slotTimerDone())); + TQTimer::singleShot(10, this, TQT_SLOT(slotTimerDone())); } KEditEquityEntryDlg::~KEditEquityEntryDlg() @@ -115,7 +115,7 @@ void KEditEquityEntryDlg::slotOKClicked() accept(); } -void KEditEquityEntryDlg::slotSelectionChanged(QListViewItem* item) +void KEditEquityEntryDlg::slotSelectionChanged(TQListViewItem* item) { btnEditEntry->setEnabled(item != 0); btnRemoveEntry->setEnabled(item != 0); diff --git a/kmymoney2/dialogs/keditequityentrydlg.h b/kmymoney2/dialogs/keditequityentrydlg.h index 0fdf40e..ae9dc58 100644 --- a/kmymoney2/dialogs/keditequityentrydlg.h +++ b/kmymoney2/dialogs/keditequityentrydlg.h @@ -20,13 +20,13 @@ * * ***************************************************************************/ -#ifndef KEDITEQUITYENTRYDLG_H -#define KEDITEQUITYENTRYDLG_H +#ifndef KEDITETQUITYENTRYDLG_H +#define KEDITETQUITYENTRYDLG_H // ---------------------------------------------------------------------------- // QT Includes -#include <qdialog.h> +#include <tqdialog.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -47,8 +47,9 @@ class KEditEquityEntryDlg : public KEditEquityEntryDecl { Q_OBJECT + TQ_OBJECT public: - KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity, QWidget *parent = NULL, const char *name = NULL); + KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity, TQWidget *tqparent = NULL, const char *name = NULL); ~KEditEquityEntryDlg(); void updatedEquity(MyMoneySecurity& security) { security = m_selectedSecurity; } @@ -56,7 +57,7 @@ public: protected slots: void slotOKClicked(); void slotDataChanged(void); - void slotSelectionChanged(QListViewItem* item); + void slotSelectionChanged(TQListViewItem* item); private slots: void slotTimerDone(void); diff --git a/kmymoney2/dialogs/keditloanwizard.cpp b/kmymoney2/dialogs/keditloanwizard.cpp index 6054cec..3992550 100644 --- a/kmymoney2/dialogs/keditloanwizard.cpp +++ b/kmymoney2/dialogs/keditloanwizard.cpp @@ -23,9 +23,9 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qlabel.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -48,19 +48,19 @@ #include "../mymoney/mymoneyfile.h" #include "../kmymoneyutils.h" -KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, QWidget *parent, const char *name ) : - KNewLoanWizard(parent, name) +KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, TQWidget *tqparent, const char *name ) : + KNewLoanWizard(tqparent, name) { MyMoneyFile* file = MyMoneyFile::instance(); setCaption(i18n("Edit loan wizard")); - m_effectiveDateLabel->setText(QString("\n") + i18n( + m_effectiveDateLabel->setText(TQString("\n") + i18n( "Please enter the date from which on the following changes will be effective. " "The date entered must be later than the opening date of this account (%1), but must " - "not be in the future. The default will be today.").arg(KGlobal::locale()->formatDate(account.openingDate(), true))); + "not be in the future. The default will be today.").tqarg(KGlobal::locale()->formatDate(account.openingDate(), true))); m_account = account; try { - QString id = m_account.value("schedule"); + TQString id = m_account.value("schedule"); m_schedule = file->schedule(id); } catch (MyMoneyException *e) { delete e; @@ -71,11 +71,11 @@ KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, QWidget *parent, loadWidgets(m_account); - if(m_account.openingDate() > QDate::currentDate()) { - m_effectiveDateNoteLabel->setText(QString("\n") + i18n( + if(m_account.openingDate() > TQDate::tqcurrentDate()) { + 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." - ).arg(KGlobal::locale()->formatDate(m_account.openingDate(), true))); + ).tqarg(KGlobal::locale()->formatDate(m_account.openingDate(), true))); } else { m_effectiveDateNoteLabel->hide(); } @@ -94,9 +94,9 @@ KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, QWidget *parent, setAppropriate(m_editSelectionPage, true); // setup connections - connect(m_effectiveChangeDateEdit, SIGNAL(dateChanged(const QDate&)), this, SLOT(slotCheckPageFinished())); - connect(m_newPaymentEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPageFinished())); - connect(m_newInterestRateEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPageFinished())); + connect(m_effectiveChangeDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), this, TQT_SLOT(slotCheckPageFinished())); + connect(m_newPaymentEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPageFinished())); + connect(m_newInterestRateEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPageFinished())); // make sure, we show the correct start page showPage(m_editIntroPage); @@ -109,7 +109,7 @@ KEditLoanWizard::~KEditLoanWizard() void KEditLoanWizard::loadWidgets(const MyMoneyAccount& /* account */) { MyMoneyFile* file = MyMoneyFile::instance(); - QString paymentAccountId, interestAccountId; + TQString paymentAccountId, interestAccountId; m_nameEdit->loadText(m_account.name()); m_loanAmountEdit->loadText(m_account.loanAmount().formatMoney(m_account.fraction(MyMoneyFile::instance()->security(m_account.currencyId())))); @@ -123,15 +123,15 @@ void KEditLoanWizard::loadWidgets(const MyMoneyAccount& /* account */) } MyMoneyMoney ir; - if(m_schedule.startDate() > QDate::currentDate()) { + if(m_schedule.startDate() > TQDate::tqcurrentDate()) { ir = m_account.interestRate(m_schedule.startDate()); } else { - ir = m_account.interestRate(QDate::currentDate()); + ir = m_account.interestRate(TQDate::tqcurrentDate()); } m_interestRateEdit->loadText(ir.formatMoney("", 3)); m_newInterestRateEdit->loadText(ir.formatMoney("", 3)); m_newInterestRateEdit->setPrecision(3); - m_interestRateLabel->setText(QString(" ") + ir.formatMoney("", 3) + QString("%")); + m_interestRateLabel->setText(TQString(" ") + ir.formatMoney("", 3) + TQString("%")); m_paymentFrequencyUnitEdit->setCurrentItem(i18n(m_schedule.occurenceToString())); updateTermWidgets(m_account.term()); @@ -144,7 +144,7 @@ void KEditLoanWizard::loadWidgets(const MyMoneyAccount& /* account */) m_transaction = m_schedule.transaction(); - QValueList<MyMoneySplit>::ConstIterator it_s; + TQValueList<MyMoneySplit>::ConstIterator it_s; for(it_s = m_schedule.transaction().splits().begin(); it_s != m_schedule.transaction().splits().end(); ++it_s) { @@ -210,7 +210,7 @@ void KEditLoanWizard::loadWidgets(const MyMoneyAccount& /* account */) int fraction = m_account.fraction(MyMoneyFile::instance()->security(m_account.currencyId())); m_paymentEdit->loadText(basePayment.formatMoney(fraction)); m_newPaymentEdit->loadText(basePayment.formatMoney(fraction)); - m_paymentLabel->setText(QString(" ") + basePayment.formatMoney(fraction)); + m_paymentLabel->setText(TQString(" ") + basePayment.formatMoney(fraction)); m_additionalCost->setText(addPayment.formatMoney(fraction)); m_interestAccountEdit->setSelected(interestAccountId); @@ -234,16 +234,16 @@ void KEditLoanWizard::loadWidgets(const MyMoneyAccount& /* account */) void KEditLoanWizard::next() { bool dontLeavePage = false; - QButton* button = m_selectionButtonGroup->find(m_lastSelection); + TQButton* button = m_selectionButtonGroup->tqfind(m_lastSelection); if(currentPage() == m_editSelectionPage) { if(button != 0 && m_lastSelection != m_selectionButtonGroup->id(m_selectionButtonGroup->selected())) { - QString errMsg = i18n( + TQString errMsg = i18n( "Your previous selection was \"%1\". If you select another option, " "KMyMoney will dismiss the changes you have just entered. " - "Do you wish to proceed?").arg(button->text()); + "Do you wish to proceed?").tqarg(button->text()); if(KMessageBox::questionYesNo(this, errMsg) == KMessageBox::No) { dontLeavePage = true; @@ -363,12 +363,12 @@ void KEditLoanWizard::next() // now and always calculate with the full loan amount. MyMoneyMoney balance = m_account.openingBalance(); - QValueList<MyMoneyTransaction> list; - QValueList<MyMoneyTransaction>::ConstIterator it; + TQValueList<MyMoneyTransaction> list; + TQValueList<MyMoneyTransaction>::ConstIterator it; MyMoneySplit split; MyMoneyTransactionFilter filter(m_account.id()); - filter.setDateFilter(QDate(), m_effectiveChangeDateEdit->date().addDays(-1)); + filter.setDateFilter(TQDate(), m_effectiveChangeDateEdit->date().addDays(-1)); list = MyMoneyFile::instance()->transactionList(filter); for(it = list.begin(); it != list.end(); ++it) { @@ -417,7 +417,7 @@ void KEditLoanWizard::slotCheckPageFinished(void) if(currentPage() == m_effectiveDatePage) { if(m_effectiveChangeDateEdit->date() < m_account.openingDate() - || m_effectiveChangeDateEdit->date() > QDate::currentDate()) + || m_effectiveChangeDateEdit->date() > TQDate::tqcurrentDate()) nextButton()->setEnabled(false); } else if(currentPage() == m_interestEditPage) { @@ -438,15 +438,15 @@ void KEditLoanWizard::updateEditSummary(void) // calculate the number of affected transactions MyMoneyTransactionFilter filter(m_account.id()); - filter.setDateFilter(m_effectiveChangeDateEdit->date(), QDate()); + filter.setDateFilter(m_effectiveChangeDateEdit->date(), TQDate()); int count = 0; - QValueList<MyMoneyTransaction> list; - QValueList<MyMoneyTransaction>::ConstIterator it; + TQValueList<MyMoneyTransaction> list; + TQValueList<MyMoneyTransaction>::ConstIterator it; list = MyMoneyFile::instance()->transactionList(filter); for(it = list.begin(); it != list.end(); ++it) { - QValueList<MyMoneySplit>::ConstIterator it_s; + TQValueList<MyMoneySplit>::ConstIterator it_s; int match = 0; for(it_s = (*it).splits().begin(); it_s != (*it).splits().end(); ++it_s) { // we only count those transactions that have an interest @@ -460,7 +460,7 @@ void KEditLoanWizard::updateEditSummary(void) count++; } - m_affectedPayments->setText(QString().sprintf("%d", count)); + m_affectedPayments->setText(TQString().sprintf("%d", count)); } const MyMoneySchedule KEditLoanWizard::schedule(void) const @@ -503,7 +503,7 @@ const MyMoneyAccount KEditLoanWizard::account(void) const const MyMoneyTransaction KEditLoanWizard::transaction() const { MyMoneyTransaction t = KNewLoanWizard::transaction(); - MyMoneySplit s = t.splitByAccount(QString("Phony-ID")); + MyMoneySplit s = t.splitByAccount(TQString("Phony-ID")); s.setAccountId(m_account.id()); t.modifySplit(s); diff --git a/kmymoney2/dialogs/keditloanwizard.h b/kmymoney2/dialogs/keditloanwizard.h index 0598248..f2efbdf 100644 --- a/kmymoney2/dialogs/keditloanwizard.h +++ b/kmymoney2/dialogs/keditloanwizard.h @@ -26,7 +26,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> +#include <tqwidget.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -44,8 +44,9 @@ class KEditLoanWizard : public KNewLoanWizard { Q_OBJECT + TQ_OBJECT public: - KEditLoanWizard(const MyMoneyAccount& account, QWidget *parent=0, const char *name=0); + KEditLoanWizard(const MyMoneyAccount& account, TQWidget *tqparent=0, const char *name=0); ~KEditLoanWizard(); /** diff --git a/kmymoney2/dialogs/keditscheduledlg.cpp b/kmymoney2/dialogs/keditscheduledlg.cpp index 635d564..559fddd 100644 --- a/kmymoney2/dialogs/keditscheduledlg.cpp +++ b/kmymoney2/dialogs/keditscheduledlg.cpp @@ -18,12 +18,12 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qtimer.h> -#include <qwidgetlist.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qvaluevector.h> +#include <tqtimer.h> +#include <tqwidgetlist.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqvaluevector.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -55,13 +55,13 @@ class KEditScheduleDlg::Private { public: MyMoneySchedule m_schedule; KMyMoneyRegister::Transaction* m_item; - QWidgetList m_tabOrderWidgets; + TQWidgetList m_tabOrderWidgets; TransactionEditor* m_editor; kMandatoryFieldGroup* m_requiredFields; }; -KEditScheduleDlg::KEditScheduleDlg(const MyMoneySchedule& schedule, QWidget *parent, const char *name) : - KEditScheduleDlgDecl(parent, name, true), +KEditScheduleDlg::KEditScheduleDlg(const MyMoneySchedule& schedule, TQWidget *tqparent, const char *name) : + KEditScheduleDlgDecl(tqparent, name, true), d(new Private) { d->m_schedule = schedule; @@ -71,12 +71,12 @@ KEditScheduleDlg::KEditScheduleDlg(const MyMoneySchedule& schedule, QWidget *par buttonCancel->setGuiItem(KStdGuiItem::cancel()); buttonHelp->setGuiItem(KStdGuiItem::help()); - d->m_requiredFields = new kMandatoryFieldGroup (this); + d->m_requiredFields = new kMandatoryFieldGroup (TQT_TQOBJECT(this)); d->m_requiredFields->setOkButton(buttonOk); // button to be enabled when all fields present // make sure, we have a tabbar with the form // insert it after the horizontal line - m_paymentInformationLayout->insertWidget(2, m_form->tabBar(m_form->parentWidget())); + m_paymentInformationLayout->insertWidget(2, m_form->tabBar(m_form->tqparentWidget())); // we never need to see the register m_register->hide(); @@ -111,7 +111,7 @@ KEditScheduleDlg::KEditScheduleDlg(const MyMoneySchedule& schedule, QWidget *par m_paymentMethodEdit->insertItem(i18n("Direct debit"), MyMoneySchedule::STYPE_DIRECTDEBIT); m_paymentMethodEdit->insertItem(i18n("Standing order"), MyMoneySchedule::STYPE_STANDINGORDER); m_paymentMethodEdit->insertItem(i18n("Bank transfer"), MyMoneySchedule::STYPE_BANKTRANSFER); - m_paymentMethodEdit->insertItem(i18n("Write check"), MyMoneySchedule::STYPE_WRITECHEQUE); + m_paymentMethodEdit->insertItem(i18n("Write check"), MyMoneySchedule::STYPE_WRITECHETQUE); m_paymentMethodEdit->insertItem(i18n("Other"), MyMoneySchedule::STYPE_OTHER); MyMoneySchedule::paymentTypeE method = d->m_schedule.paymentType(); @@ -140,18 +140,18 @@ KEditScheduleDlg::KEditScheduleDlg(const MyMoneySchedule& schedule, QWidget *par m_FinalPaymentEdit->setDate(d->m_schedule.endDate()); } - connect(m_RemainingEdit, SIGNAL(valueChanged(int)), - this, SLOT(slotRemainingChanged(int))); - connect(m_FinalPaymentEdit, SIGNAL(dateChanged(const QDate&)), - this, SLOT(slotEndDateChanged(const QDate&))); - connect(m_frequencyEdit, SIGNAL(itemSelected(int)), - this, SLOT(slotFrequencyChanged(int))); - connect(m_frequencyNoEdit, SIGNAL(valueChanged(int)), - this, SLOT(slotOccurenceMultiplierChanged(int))); - connect(buttonHelp, SIGNAL(clicked()), this, SLOT(slotShowHelp())); + connect(m_RemainingEdit, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotRemainingChanged(int))); + connect(m_FinalPaymentEdit, TQT_SIGNAL(dateChanged(const TQDate&)), + this, TQT_SLOT(slotEndDateChanged(const TQDate&))); + connect(m_frequencyEdit, TQT_SIGNAL(itemSelected(int)), + this, TQT_SLOT(slotFrequencyChanged(int))); + connect(m_frequencyNoEdit, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotOccurenceMultiplierChanged(int))); + connect(buttonHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowHelp())); // force the initial height to be as small as possible - QTimer::singleShot(0, this, SLOT(slotSetupSize())); + TQTimer::singleShot(0, this, TQT_SLOT(slotSetupSize())); // we just hide the variation field for now and enable the logic // once we have a respective member in the MyMoneySchedule object @@ -165,13 +165,13 @@ KEditScheduleDlg::~KEditScheduleDlg() void KEditScheduleDlg::slotSetupSize(void) { - resize(width(), minimumSizeHint().height()); + resize(width(), tqminimumSizeHint().height()); } TransactionEditor* KEditScheduleDlg::startEdit(void) { KMyMoneyRegister::SelectedTransactions list(m_register); - TransactionEditor* editor = d->m_item->createEditor(m_form, list, QDate()); + TransactionEditor* editor = d->m_item->createEditor(m_form, list, TQDate()); // check that we use the same transaction commodity in all selected transactions // if not, we need to update this in the editor's list. The user can also bail out @@ -186,18 +186,18 @@ TransactionEditor* KEditScheduleDlg::startEdit(void) } if(editor) { - connect(editor, SIGNAL(transactionDataSufficient(bool)), buttonOk, SLOT(setEnabled(bool))); - connect(editor, SIGNAL(escapePressed()), buttonCancel, SLOT(animateClick())); - connect(editor, SIGNAL(returnPressed()), buttonOk, SLOT(animateClick())); - - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), editor, SLOT(slotReloadEditWidgets())); - // connect(editor, SIGNAL(finishEdit(const KMyMoneyRegister::SelectedTransactions&)), this, SLOT(slotLeaveEditMode(const KMyMoneyRegister::SelectedTransactions&))); - connect(editor, SIGNAL(createPayee(const QString&, QString&)), kmymoney2, SLOT(slotPayeeNew(const QString&, QString&))); - connect(editor, SIGNAL(createCategory(MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, SLOT(slotCategoryNew(MyMoneyAccount&, const MyMoneyAccount&))); - connect(editor, SIGNAL(createSecurity(MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, SLOT(slotInvestmentNew(MyMoneyAccount&, const MyMoneyAccount&))); - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), editor, SLOT(slotReloadEditWidgets())); - - // create the widgets, place them in the parent and load them with data + connect(editor, TQT_SIGNAL(transactionDataSufficient(bool)), buttonOk, TQT_SLOT(setEnabled(bool))); + connect(editor, TQT_SIGNAL(escapePressed()), buttonCancel, TQT_SLOT(animateClick())); + connect(editor, TQT_SIGNAL(returnPressed()), buttonOk, TQT_SLOT(animateClick())); + + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), editor, TQT_SLOT(slotReloadEditWidgets())); + // connect(editor, TQT_SIGNAL(finishEdit(const KMyMoneyRegister::SelectedTransactions&)), this, TQT_SLOT(slotLeaveEditMode(const KMyMoneyRegister::SelectedTransactions&))); + connect(editor, TQT_SIGNAL(createPayee(const TQString&, TQString&)), kmymoney2, TQT_SLOT(slotPayeeNew(const TQString&, TQString&))); + connect(editor, TQT_SIGNAL(createCategory(MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotCategoryNew(MyMoneyAccount&, const MyMoneyAccount&))); + connect(editor, TQT_SIGNAL(createSecurity(MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotInvestmentNew(MyMoneyAccount&, const MyMoneyAccount&))); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), editor, TQT_SLOT(slotReloadEditWidgets())); + + // create the widgets, place them in the tqparent and load them with data // setup tab order d->m_tabOrderWidgets.clear(); KMyMoneyRegister::Action action = KMyMoneyRegister::ActionWithdrawal; @@ -216,7 +216,7 @@ TransactionEditor* KEditScheduleDlg::startEdit(void) // into the transaction and determine the type. in case we don't have a transaction with splits // we stick with the default action already set up if(d->m_schedule.transaction().splits().count() > 0) { - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; bool isDeposit = false; bool isTransfer = false; for(it_s = d->m_schedule.transaction().splits().begin(); it_s != d->m_schedule.transaction().splits().end(); ++it_s) { @@ -241,10 +241,10 @@ TransactionEditor* KEditScheduleDlg::startEdit(void) // if it's not a check, then we need to clear // a possibly assigned check number - if(d->m_schedule.paymentType() != MyMoneySchedule::STYPE_WRITECHEQUE) { - QWidget* w = editor->haveWidget("number"); + if(d->m_schedule.paymentType() != MyMoneySchedule::STYPE_WRITECHETQUE) { + TQWidget* w = editor->haveWidget("number"); if(w) - dynamic_cast<kMyMoneyLineEdit*>(w)->loadText(QString()); + dynamic_cast<kMyMoneyLineEdit*>(w)->loadText(TQString()); } Q_ASSERT(!d->m_tabOrderWidgets.isEmpty()); @@ -268,7 +268,7 @@ TransactionEditor* KEditScheduleDlg::startEdit(void) d->m_tabOrderWidgets.append(m_form); // install event filter in all taborder widgets - QWidget* w; + TQWidget* w; for(w = d->m_tabOrderWidgets.first(); w; w = d->m_tabOrderWidgets.next()) { w->installEventFilter(this); w->installEventFilter(editor); @@ -277,7 +277,7 @@ TransactionEditor* KEditScheduleDlg::startEdit(void) // connect the postdate modification signal to our update routine kMyMoneyDateInput* dateEdit = dynamic_cast<kMyMoneyDateInput*>(editor->haveWidget("postdate")); if(dateEdit) - connect(dateEdit, SIGNAL(dateChanged(const QDate&)), this, SLOT(slotPostDateChanged(const QDate&))); + connect(dateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), this, TQT_SLOT(slotPostDateChanged(const TQDate&))); m_nameEdit->setFocus(); @@ -288,7 +288,7 @@ TransactionEditor* KEditScheduleDlg::startEdit(void) d->m_requiredFields->add(editor->haveWidget("category")); // fix labels - QLabel* label = dynamic_cast<QLabel*>(editor->haveWidget("date-label")); + TQLabel* label = dynamic_cast<TQLabel*>(editor->haveWidget("date-label")); if(label) { label->setText(i18n("Next due date")); } @@ -296,7 +296,7 @@ TransactionEditor* KEditScheduleDlg::startEdit(void) d->m_editor = editor; slotSetPaymentMethod(d->m_schedule.paymentType()); - connect(m_paymentMethodEdit, SIGNAL(itemSelected(int)), this, SLOT(slotSetPaymentMethod(int))); + connect(m_paymentMethodEdit, TQT_SIGNAL(itemSelected(int)), this, TQT_SLOT(slotSetPaymentMethod(int))); } return editor; @@ -366,7 +366,7 @@ const MyMoneySchedule& KEditScheduleDlg::schedule(void) const if(m_endSeriesEdit->isEnabled() && m_endSeriesEdit->isChecked()) { d->m_schedule.setEndDate(m_FinalPaymentEdit->date()); } else { - d->m_schedule.setEndDate(QDate()); + d->m_schedule.setEndDate(TQDate()); } } return d->m_schedule; @@ -381,7 +381,7 @@ MyMoneyTransaction KEditScheduleDlg::transaction(void) const } t.clearId(); - t.setEntryDate(QDate()); + t.setEntryDate(TQDate()); return t; } @@ -390,13 +390,13 @@ bool KEditScheduleDlg::focusNextPrevChild(bool next) bool rc = false; // qDebug("KEditScheduleDlg::focusNextPrevChild(editmode=%s)", m_inEditMode ? "true" : "false"); - QWidget *w = 0; - QWidget *currentWidget; + TQWidget *w = 0; + TQWidget *currentWidget; - w = qApp->focusWidget(); - while(w && d->m_tabOrderWidgets.find(w) == -1) { - // qDebug("'%s' not in list, use parent", w->className()); - w = w->parentWidget(); + w = tqApp->tqfocusWidget(); + while(w && d->m_tabOrderWidgets.tqfind(w) == -1) { + // qDebug("'%s' not in list, use tqparent", w->className()); + w = w->tqparentWidget(); } // if(w) qDebug("tab order is at '%s'", w->className()); currentWidget = d->m_tabOrderWidgets.current(); @@ -408,7 +408,7 @@ bool KEditScheduleDlg::focusNextPrevChild(bool next) } if(w != currentWidget - && ((w->focusPolicy() & TabFocus) == TabFocus) + && ((w->focusPolicy() & TQ_TabFocus) == TQ_TabFocus) && w->isVisible() && w->isEnabled()) { // qDebug("Selecting '%s' as focus", w->className()); w->setFocus(); @@ -421,7 +421,7 @@ bool KEditScheduleDlg::focusNextPrevChild(bool next) return rc; } -void KEditScheduleDlg::resizeEvent(QResizeEvent* ev) +void KEditScheduleDlg::resizeEvent(TQResizeEvent* ev) { m_register->resize(KMyMoneyRegister::DetailColumn); m_form->resize(KMyMoneyTransactionForm::ValueColumn1); @@ -444,7 +444,7 @@ void KEditScheduleDlg::slotRemainingChanged(int value) } } -void KEditScheduleDlg::slotEndDateChanged(const QDate& date) +void KEditScheduleDlg::slotEndDateChanged(const TQDate& date) { // Make sure the required fields are set kMyMoneyDateInput* dateEdit = dynamic_cast<kMyMoneyDateInput*>(d->m_editor->haveWidget("postdate")); @@ -458,7 +458,7 @@ void KEditScheduleDlg::slotEndDateChanged(const QDate& date) } } -void KEditScheduleDlg::slotPostDateChanged(const QDate& date) +void KEditScheduleDlg::slotPostDateChanged(const TQDate& date) { if(d->m_schedule.nextDueDate() != date) { if (m_endOptionsFrame->isEnabled()) { @@ -475,13 +475,13 @@ void KEditScheduleDlg::slotSetPaymentMethod(int item) { kMyMoneyLineEdit* dateEdit = dynamic_cast<kMyMoneyLineEdit*>(d->m_editor->haveWidget("number")); if(dateEdit) { - dateEdit->setShown(item == MyMoneySchedule::STYPE_WRITECHEQUE); + dateEdit->setShown(item == MyMoneySchedule::STYPE_WRITECHETQUE); // hiding the label does not work, because the label underneath will shine // through. So we either write the label or a blank - QLabel* label = dynamic_cast<QLabel *>(d->m_editor->haveWidget("number-label")); + TQLabel* label = dynamic_cast<TQLabel *>(d->m_editor->haveWidget("number-label")); if(label) { - label->setText((item == MyMoneySchedule::STYPE_WRITECHEQUE) ? i18n("Number") : " "); + label->setText((item == MyMoneySchedule::STYPE_WRITECHETQUE) ? i18n("Number") : " "); } } } diff --git a/kmymoney2/dialogs/keditscheduledlg.h b/kmymoney2/dialogs/keditscheduledlg.h index 94c3101..db80aea 100644 --- a/kmymoney2/dialogs/keditscheduledlg.h +++ b/kmymoney2/dialogs/keditscheduledlg.h @@ -40,11 +40,12 @@ class TransactionEditor; class KEditScheduleDlg : public KEditScheduleDlgDecl { Q_OBJECT + TQ_OBJECT public: /** - * Standard QWidget constructor. + * Standard TQWidget constructor. **/ - KEditScheduleDlg(const MyMoneySchedule& schedule, QWidget *parent=0, const char *name=0); + KEditScheduleDlg(const MyMoneySchedule& schedule, TQWidget *tqparent=0, const char *name=0); /** * Standard destructor. @@ -66,19 +67,19 @@ protected: * This method adjusts @a _date according to the rules specified by * the schedule's weekend option. */ - QDate adjustDate(const QDate& _date) const; + TQDate adjustDate(const TQDate& _date) const; /// Overridden for internal reasons. No API changes. bool focusNextPrevChild(bool next); /// Overridden for internal reasons. No API changes. - void resizeEvent(QResizeEvent* ev); + void resizeEvent(TQResizeEvent* ev); private slots: void slotSetupSize(void); void slotRemainingChanged(int); - void slotEndDateChanged(const QDate& date); - void slotPostDateChanged(const QDate& date); + void slotEndDateChanged(const TQDate& date); + void slotPostDateChanged(const TQDate& date); void slotSetPaymentMethod(int); void slotFrequencyChanged(int item); void slotShowHelp(void); diff --git a/kmymoney2/dialogs/keditscheduledlgdecl.ui b/kmymoney2/dialogs/keditscheduledlgdecl.ui index 8555c58..494fa46 100644 --- a/kmymoney2/dialogs/keditscheduledlgdecl.ui +++ b/kmymoney2/dialogs/keditscheduledlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KEditScheduleDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KEditScheduleDlgDecl</cstring> </property> @@ -22,23 +22,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -53,15 +53,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -92,7 +92,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_paymentInformation</cstring> </property> @@ -103,15 +103,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> @@ -234,7 +234,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -245,9 +245,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> @@ -273,7 +273,7 @@ <cstring>m_weekendOptionEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -283,15 +283,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_estimateEdit</cstring> </property> @@ -320,7 +320,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -329,7 +329,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_autoEnterEdit</cstring> </property> @@ -337,7 +337,7 @@ <string>Enter this schedule into the register automatically when it is due</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_endSeriesEdit</cstring> </property> @@ -345,7 +345,7 @@ <string>This schedule will end at some time</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_endOptionsFrame</cstring> </property> @@ -372,14 +372,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_endLabel1</cstring> </property> @@ -398,7 +398,7 @@ <number>9999</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_endLabel2</cstring> </property> @@ -428,16 +428,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10_3</cstring> + <cstring>tqlayout10_3</cstring> </property> <hbox> <property name="name"> @@ -467,7 +467,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>280</width> <height>0</height> @@ -528,5 +528,8 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kendingbalancedlg.cpp b/kmymoney2/dialogs/kendingbalancedlg.cpp index 0760cc2..05b2896 100644 --- a/kmymoney2/dialogs/kendingbalancedlg.cpp +++ b/kmymoney2/dialogs/kendingbalancedlg.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qpixmap.h> +#include <tqpixmap.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -46,7 +46,7 @@ public: MyMoneyTransaction m_tInterest; MyMoneyTransaction m_tCharges; MyMoneyAccount m_account; - QMap<QWidget*, QString> m_helpAnchor; + TQMap<TQWidget*, TQString> m_helpAnchor; }; class KEndingBalanceLoanDlg::Private @@ -55,22 +55,22 @@ public: MyMoneyTransaction m_tInterest; MyMoneyTransaction m_tCharges; MyMoneyAccountLoan m_account; - QMap<QWidget*, QString> m_helpAnchor; + TQMap<TQWidget*, TQString> m_helpAnchor; }; -KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, QWidget *parent, const char *name) : - KEndingBalanceDlgDecl(parent, name, true), +KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *tqparent, const char *name) : + KEndingBalanceDlgDecl(tqparent, name, true), d(new Private) { - QString value; + TQString value; MyMoneyMoney endBalance, startBalance; d->m_account = account; MyMoneySecurity currency = MyMoneyFile::instance()->security(account.currencyId()); - m_enterInformationLabel->setText(QString("<qt>")+i18n("Please enter the following fields with the information as you find them on your statement. Make sure to enter all values in <b>%1</b>.").arg(currency.name())+QString("</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(QDate::currentDate()); + m_statementDate->setDate(TQDate::tqcurrentDate()); // If the previous reconciliation was postponed, // we show a different first page @@ -79,8 +79,8 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, QWidget *par // if the last statement has been entered long enough ago (more than one month), // then take the last statement date and add one month and use that as statement // date. - QDate lastStatementDate = account.lastReconciliationDate(); - if(lastStatementDate.addMonths(1) < QDate::currentDate()) { + TQDate lastStatementDate = account.lastReconciliationDate(); + if(lastStatementDate.addMonths(1) < TQDate::tqcurrentDate()) { m_statementDate->setDate(lastStatementDate.addMonths(1)); } @@ -111,18 +111,18 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, QWidget *par } // We don't need to add the default into the list (see ::help() why) - // m_helpAnchor[m_startPageCheckings] = QString(""); - d->m_helpAnchor[m_interestChargeCheckings] = QString("details.reconcile.wizard.interest"); - d->m_helpAnchor[m_statementInfoPageCheckings] = QString("details.reconcile.wizard.statement"); + // m_helpAnchor[m_startPageCheckings] = TQString(""); + d->m_helpAnchor[m_interestChargeCheckings] = TQString("details.reconcile.wizard.interest"); + d->m_helpAnchor[m_statementInfoPageCheckings] = TQString("details.reconcile.wizard.statement"); value = account.value("statementDate"); if(!value.isEmpty()) - m_statementDate->setDate(QDate::fromString(value, Qt::ISODate)); + m_statementDate->setDate(TQDate::fromString(value, Qt::ISODate)); - m_lastStatementDate->setText(QString()); + m_lastStatementDate->setText(TQString()); if(account.lastReconciliationDate().isValid()) { m_lastStatementDate->setText(i18n("Last reconciled statement: %1") - .arg(KGlobal::locale()->formatDate(account.lastReconciliationDate(), true))); + .tqarg(KGlobal::locale()->formatDate(account.lastReconciliationDate(), true))); } // remove all unwanted pages @@ -131,16 +131,16 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, QWidget *par removePage(m_adjustmentTransactionPage); // connect the signals with the slots - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotReloadEditWidgets())); - connect(m_payeeEdit, SIGNAL(createItem(const QString&, QString&)), this, SIGNAL(createPayee(const QString&, QString&))); - connect(m_interestCategoryEdit, SIGNAL(createItem(const QString&, QString&)), this, SLOT(slotCreateInterestCategory(const QString&, QString&))); - connect(m_chargesCategoryEdit, SIGNAL(createItem(const QString&, QString&)), this, SLOT(slotCreateChargesCategory(const QString&, QString&))); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotReloadEditWidgets())); + connect(m_payeeEdit, TQT_SIGNAL(createItem(const TQString&, TQString&)), this, TQT_SIGNAL(createPayee(const TQString&, TQString&))); + connect(m_interestCategoryEdit, TQT_SIGNAL(createItem(const TQString&, TQString&)), this, TQT_SLOT(slotCreateInterestCategory(const TQString&, TQString&))); + connect(m_chargesCategoryEdit, TQT_SIGNAL(createItem(const TQString&, TQString&)), this, TQT_SLOT(slotCreateChargesCategory(const TQString&, TQString&))); - connect(m_interestEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPageFinished(void))); - connect(m_interestCategoryEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPageFinished(void))); - connect(m_chargesEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPageFinished(void))); - connect(m_chargesCategoryEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPageFinished(void))); - connect(m_statementDate, SIGNAL(dateChanged(const QDate&)), this, SLOT(slotUpdateBalances())); + connect(m_interestEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPageFinished(void))); + connect(m_interestCategoryEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPageFinished(void))); + connect(m_chargesEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPageFinished(void))); + connect(m_chargesCategoryEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPageFinished(void))); + connect(m_statementDate, TQT_SIGNAL(dateChanged(const TQDate&)), this, TQT_SLOT(slotUpdateBalances())); slotReloadEditWidgets(); @@ -180,8 +180,8 @@ void KEndingBalanceDlg::slotUpdateBalances(void) filter.addState(MyMoneyTransactionFilter::cleared); filter.setReportAllSplits(true); - QValueList<QPair<MyMoneyTransaction, MyMoneySplit> > transactionList; - QValueList<QPair<MyMoneyTransaction, MyMoneySplit> >::const_iterator it; + TQValueList<TQPair<MyMoneyTransaction, MyMoneySplit> > transactionList; + TQValueList<TQPair<MyMoneyTransaction, MyMoneySplit> >::const_iterator it; // retrieve the list from the engine MyMoneyFile::instance()->transactionList(transactionList, filter); @@ -236,22 +236,22 @@ void KEndingBalanceDlg::accept(void) KEndingBalanceDlgDecl::accept(); } -void KEndingBalanceDlg::slotCreateInterestCategory(const QString& txt, QString& id) +void KEndingBalanceDlg::slotCreateInterestCategory(const TQString& txt, TQString& id) { createCategory(txt, id, MyMoneyFile::instance()->income()); } -void KEndingBalanceDlg::slotCreateChargesCategory(const QString& txt, QString& id) +void KEndingBalanceDlg::slotCreateChargesCategory(const TQString& txt, TQString& id) { createCategory(txt, id, MyMoneyFile::instance()->expense()); } -void KEndingBalanceDlg::createCategory(const QString& txt, QString& id, const MyMoneyAccount& parent) +void KEndingBalanceDlg::createCategory(const TQString& txt, TQString& id, const MyMoneyAccount& tqparent) { MyMoneyAccount acc; acc.setName(txt); - emit createCategory(acc, parent); + emit createCategory(acc, tqparent); id = acc.id(); } @@ -273,7 +273,7 @@ const MyMoneyMoney KEndingBalanceDlg::adjustedReturnValue(const MyMoneyMoney& v) void KEndingBalanceDlg::slotReloadEditWidgets(void) { - QString payeeId, interestId, chargesId; + TQString payeeId, interestId, chargesId; // keep current selected items payeeId = m_payeeEdit->selectedItem(); @@ -351,7 +351,7 @@ bool KEndingBalanceDlg::createTransaction(MyMoneyTransaction &t, const int sign, t.addSplit(s1); t.addSplit(s2); - QMap<QString, MyMoneyMoney> priceInfo; // just empty + TQMap<TQString, MyMoneyMoney> priceInfo; // just empty MyMoneyMoney shares; if(!KCurrencyCalculator::setupSplitPrice(shares, t, s2, priceInfo, this)) { t = MyMoneyTransaction(); @@ -373,19 +373,19 @@ bool KEndingBalanceDlg::createTransaction(MyMoneyTransaction &t, const int sign, void KEndingBalanceDlg::help(void) { - QString anchor = d->m_helpAnchor[currentPage()]; + TQString anchor = d->m_helpAnchor[currentPage()]; if(anchor.isEmpty()) - anchor = QString("details.reconcile.whatis"); + anchor = TQString("details.reconcile.whatis"); kapp->invokeHelp(anchor); } -KEndingBalanceLoanDlg::KEndingBalanceLoanDlg(const MyMoneyAccount& account, QWidget *parent, const char *name) : - KEndingBalanceDlgDecl(parent, name, true), +KEndingBalanceLoanDlg::KEndingBalanceLoanDlg(const MyMoneyAccount& account, TQWidget *tqparent, const char *name) : + KEndingBalanceDlgDecl(tqparent, name, true), d(new Private) { d->m_account = account; - QDate value = account.lastReconciliationDate(); + TQDate value = account.lastReconciliationDate(); if(value.isValid()) m_startDateEdit->setDate(value.addDays(1)); else @@ -404,10 +404,10 @@ KEndingBalanceLoanDlg::KEndingBalanceLoanDlg(const MyMoneyAccount& account, QWid removePage(m_interestChargeCheckings); // connect the signals with the slots - connect(m_amortizationTotalEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPageFinished(void))); - connect(m_interestTotalEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPageFinished(void))); - connect(m_accountEdit, SIGNAL(stateChanged(void)), this, SLOT(slotCheckPageFinished(void))); - connect(m_categoryEdit, SIGNAL(stateChanged(void)), this, SLOT(slotCheckPageFinished(void))); + connect(m_amortizationTotalEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPageFinished(void))); + connect(m_interestTotalEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPageFinished(void))); + connect(m_accountEdit, TQT_SIGNAL(stateChanged(void)), this, TQT_SLOT(slotCheckPageFinished(void))); + connect(m_categoryEdit, TQT_SIGNAL(stateChanged(void)), this, TQT_SLOT(slotCheckPageFinished(void))); } KEndingBalanceLoanDlg::~KEndingBalanceLoanDlg() @@ -452,17 +452,17 @@ void KEndingBalanceLoanDlg::slotCheckPageFinished(void) } } -const MyMoneyMoney KEndingBalanceLoanDlg::totalInterest(const QDate& start, const QDate& end) const +const MyMoneyMoney KEndingBalanceLoanDlg::totalInterest(const TQDate& start, const TQDate& end) const { MyMoneyMoney interest; MyMoneyTransactionFilter filter(d->m_account.id()); filter.setDateFilter(start, end); - QValueList<MyMoneyTransaction> list = MyMoneyFile::instance()->transactionList(filter); - QValueList<MyMoneyTransaction>::ConstIterator it_t; + TQValueList<MyMoneyTransaction> list = MyMoneyFile::instance()->transactionList(filter); + TQValueList<MyMoneyTransaction>::ConstIterator it_t; for(it_t = list.begin(); it_t != list.end(); ++it_t) { - QValueList<MyMoneySplit>::ConstIterator it_s; + TQValueList<MyMoneySplit>::ConstIterator it_s; for(it_s = (*it_t).splits().begin(); it_s != (*it_t).splits().end(); ++it_s) { if((*it_s).action() == MyMoneySplit::ActionInterest) { interest += (*it_s).value(); @@ -472,7 +472,7 @@ const MyMoneyMoney KEndingBalanceLoanDlg::totalInterest(const QDate& start, cons return interest; } -const MyMoneyMoney KEndingBalanceLoanDlg::totalAmortization(const QDate& start, const QDate& end) const +const MyMoneyMoney KEndingBalanceLoanDlg::totalAmortization(const TQDate& start, const TQDate& end) const { MyMoneyMoney amortization; MyMoneyMoney adjust(1,1); @@ -482,11 +482,11 @@ const MyMoneyMoney KEndingBalanceLoanDlg::totalAmortization(const QDate& start, if(d->m_account.accountType() == MyMoneyAccount::AssetLoan) adjust = -adjust; - QValueList<MyMoneyTransaction> list = MyMoneyFile::instance()->transactionList(filter); - QValueList<MyMoneyTransaction>::ConstIterator it_t; + TQValueList<MyMoneyTransaction> list = MyMoneyFile::instance()->transactionList(filter); + TQValueList<MyMoneyTransaction>::ConstIterator it_t; for(it_t = list.begin(); it_t != list.end(); ++it_t) { - QValueList<MyMoneySplit>::ConstIterator it_s; + TQValueList<MyMoneySplit>::ConstIterator it_s; for(it_s = (*it_t).splits().begin(); it_s != (*it_t).splits().end(); ++it_s) { if((*it_s).accountId() == d->m_account.id() && (*it_s).action() == MyMoneySplit::ActionAmortization @@ -510,8 +510,8 @@ void KEndingBalanceLoanDlg::next(void) m_loanOverview->setText(i18n("KMyMoney has calculated the following amounts for " "interest and amortization according to recorded payments " "between %1 and %2.") - .arg(KGlobal::locale()->formatDate(m_startDateEdit->date(), true)) - .arg(KGlobal::locale()->formatDate(m_endDateEdit->date(), true))); + .tqarg(KGlobal::locale()->formatDate(m_startDateEdit->date(), true)) + .tqarg(KGlobal::locale()->formatDate(m_endDateEdit->date(), true))); // preload widgets with calculated values if they are empty if(m_amortizationTotalEdit->value().isZero() && !amortization.isZero()) @@ -600,9 +600,9 @@ const MyMoneyTransaction KEndingBalanceLoanDlg::adjustmentTransaction(void) cons void KEndingBalanceLoanDlg::help(void) { - QString anchor = d->m_helpAnchor[currentPage()]; + TQString anchor = d->m_helpAnchor[currentPage()]; if(anchor.isEmpty()) - anchor = QString("details.reconcile.whatis"); + anchor = TQString("details.reconcile.whatis"); kapp->invokeHelp(anchor); } diff --git a/kmymoney2/dialogs/kendingbalancedlg.h b/kmymoney2/dialogs/kendingbalancedlg.h index 3b9de00..67a1098 100644 --- a/kmymoney2/dialogs/kendingbalancedlg.h +++ b/kmymoney2/dialogs/kendingbalancedlg.h @@ -20,12 +20,12 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qdialog.h> -#include <qdatetime.h> +#include <tqwidget.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqdialog.h> +#include <tqdatetime.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -51,13 +51,14 @@ class kMyMoneyEdit; class KEndingBalanceDlg : public KEndingBalanceDlgDecl { Q_OBJECT + TQ_OBJECT public: - KEndingBalanceDlg(const MyMoneyAccount& account, QWidget *parent=0, const char *name=0); + KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *tqparent=0, const char *name=0); ~KEndingBalanceDlg(); const MyMoneyMoney endingBalance(void) const; const MyMoneyMoney previousBalance(void) const; - const QDate statementDate(void) const { return m_statementDate->date(); }; + const TQDate statementDate(void) const { return m_statementDate->date(); }; const MyMoneyTransaction interestTransaction(void); const MyMoneyTransaction chargeTransaction(void); @@ -65,27 +66,27 @@ public: protected: bool createTransaction(MyMoneyTransaction& t, const int sign, kMyMoneyEdit *amountEdit, KMyMoneyCategory *categoryEdit, kMyMoneyDateInput* dateEdit); const MyMoneyMoney adjustedReturnValue(const MyMoneyMoney& v) const; - void createCategory(const QString& txt, QString& id, const MyMoneyAccount& parent); + void createCategory(const TQString& txt, TQString& id, const MyMoneyAccount& tqparent); protected slots: void slotCheckPageFinished(void); void slotReloadEditWidgets(void); void help(void); - void slotCreateInterestCategory(const QString& txt, QString& id); - void slotCreateChargesCategory(const QString& txt, QString& id); + void slotCreateInterestCategory(const TQString& txt, TQString& id); + void slotCreateChargesCategory(const TQString& txt, TQString& id); void accept(void); void slotUpdateBalances(void); signals: /** - * proxy signal for KMyMoneyPayeeCombo::createItem(const QString&, QString&) + * proxy signal for KMyMoneyPayeeCombo::createItem(const TQString&, TQString&) */ - void createPayee(const QString&, QString&); + void createPayee(const TQString&, TQString&); /** * emit when a category is about to be created */ - void createCategory(MyMoneyAccount& acc, const MyMoneyAccount& parent); + void createCategory(MyMoneyAccount& acc, const MyMoneyAccount& tqparent); private: /// \internal d-pointer class. @@ -102,8 +103,9 @@ private: class KEndingBalanceLoanDlg : public KEndingBalanceDlgDecl { Q_OBJECT + TQ_OBJECT public: - KEndingBalanceLoanDlg(const MyMoneyAccount& account, QWidget *parent=0, const char *name=0); + KEndingBalanceLoanDlg(const MyMoneyAccount& account, TQWidget *tqparent=0, const char *name=0); ~KEndingBalanceLoanDlg(); /** @@ -115,20 +117,20 @@ public: /** * This method returns the starting date of the statement as provided * by the user. The value returned is only valid if the dialog returned - * with QDialog::accept. + * with TQDialog::accept. */ - const QDate startDate(void) const { return m_startDateEdit->date(); }; + const TQDate startDate(void) const { return m_startDateEdit->date(); }; /** * This method returns the ending date of the statement as provided * by the user. The value returned is only valid if the dialog returned - * with QDialog::accept. + * with TQDialog::accept. */ - const QDate endDate(void) const { return m_endDateEdit->date(); }; + const TQDate endDate(void) const { return m_endDateEdit->date(); }; protected: - const MyMoneyMoney totalInterest(const QDate& start, const QDate& end) const; - const MyMoneyMoney totalAmortization(const QDate& start, const QDate& end) const; + const MyMoneyMoney totalInterest(const TQDate& start, const TQDate& end) const; + const MyMoneyMoney totalAmortization(const TQDate& start, const TQDate& end) const; public slots: void next(); diff --git a/kmymoney2/dialogs/kendingbalancedlgdecl.ui b/kmymoney2/dialogs/kendingbalancedlgdecl.ui index 0f77810..ed4d921 100644 --- a/kmymoney2/dialogs/kendingbalancedlgdecl.ui +++ b/kmymoney2/dialogs/kendingbalancedlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KEndingBalanceDlgDecl</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>KEndingBalanceDlgDecl</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>Reconciliation Wizard</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_startPageCheckings</cstring> </property> @@ -32,7 +32,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -43,13 +43,13 @@ All relevant information necessary for this process is usually printed on your s On the next page you will verify, that the starting and ending balance are matching those on your statement. If not, please modify the figures.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_startPageLoan</cstring> </property> @@ -66,7 +66,7 @@ On the next page you will verify, that the starting and ending balance are match <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -75,7 +75,7 @@ On the next page you will verify, that the starting and ending balance are match Please enter the following information found on your statement:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -89,14 +89,14 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>19</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -120,14 +120,14 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>42</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -146,7 +146,7 @@ Please enter the following information found on your statement:</string> <cstring>m_startDateEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -159,7 +159,7 @@ Please enter the following information found on your statement:</string> <cstring>m_endDateEdit</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -179,7 +179,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>44</width> <height>0</height> @@ -198,7 +198,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> @@ -207,7 +207,7 @@ Please enter the following information found on your statement:</string> </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_checkPaymentsPage</cstring> </property> @@ -224,18 +224,18 @@ Please enter the following information found on your statement:</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_loanOverview</cstring> </property> <property name="text"> <string>1</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout12</cstring> </property> @@ -259,14 +259,14 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -280,7 +280,7 @@ Please enter the following information found on your statement:</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -293,7 +293,7 @@ Please enter the following information found on your statement:</string> <cstring>m_amortizationTotalEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2_3</cstring> </property> @@ -318,7 +318,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>0</height> @@ -327,14 +327,14 @@ Please enter the following information found on your statement:</string> </spacer> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> <property name="text"> <string>If your statement shows different amounts, please cancel this dialog and correct the false transactions or correct the values in this dialog. In the later case, KMyMoney will create an adjustment transaction and add it to the ledger.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -348,7 +348,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>19</height> @@ -357,7 +357,7 @@ Please enter the following information found on your statement:</string> </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_adjustmentTransactionPage</cstring> </property> @@ -374,18 +374,18 @@ Please enter the following information found on your statement:</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5_2</cstring> </property> <property name="text"> <string>In order to create the adjustment transaction, KMyMoney requires an account and possibly an interest category to assign the differences to. Please select an account and - if necessary - a category.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout19</cstring> </property> @@ -399,7 +399,7 @@ Please enter the following information found on your statement:</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout16</cstring> </property> @@ -413,7 +413,7 @@ Please enter the following information found on your statement:</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel7_2</cstring> </property> @@ -431,7 +431,7 @@ Please enter the following information found on your statement:</string> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout18</cstring> </property> @@ -445,7 +445,7 @@ Please enter the following information found on your statement:</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6_2</cstring> </property> @@ -475,7 +475,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>25</height> @@ -484,7 +484,7 @@ Please enter the following information found on your statement:</string> </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_pagePreviousPostpone</cstring> </property> @@ -501,7 +501,7 @@ Please enter the following information found on your statement:</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel8</cstring> </property> @@ -512,13 +512,13 @@ It is important, that you continue with the same statement you used when you pos All information you have entered into this wizard will be shown and all transactions that you already cleared are marked with a 'C'.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_statementInfoPageCheckings</cstring> </property> @@ -547,14 +547,14 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -578,14 +578,14 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>42</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -599,7 +599,7 @@ All information you have entered into this wizard will be shown and all transact <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -612,7 +612,7 @@ All information you have entered into this wizard will be shown and all transact <cstring>m_statementDate</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -625,7 +625,7 @@ All information you have entered into this wizard will be shown and all transact <cstring>m_previousBalance</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -650,7 +650,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>46</width> <height>0</height> @@ -669,14 +669,14 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>87</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_lastStatementDate</cstring> </property> @@ -686,7 +686,7 @@ All information you have entered into this wizard will be shown and all transact </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_interestChargeCheckings</cstring> </property> @@ -729,16 +729,16 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> @@ -754,30 +754,30 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>60</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -808,7 +808,7 @@ All information you have entered into this wizard will be shown and all transact </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -835,9 +835,9 @@ All information you have entered into this wizard will be shown and all transact </sizepolicy> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> @@ -860,7 +860,7 @@ All information you have entered into this wizard will be shown and all transact </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -887,9 +887,9 @@ All information you have entered into this wizard will be shown and all transact </sizepolicy> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> @@ -924,7 +924,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>60</width> <height>20</height> @@ -943,7 +943,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> @@ -976,5 +976,10 @@ All information you have entered into this wizard will be shown and all transact <data format="PNG" length="1114">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042149444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d096e8b11261871837bc8e282ac7ac82187e049a317e32d37110992bf42123c694eea414c0e0bf1b0ec6c402139485a54e8810c54c10e741146fa110bd643f74c12bd642e4d75f77cf5d5ef7dafdfc2ce7087d9eff32fdfdff74e5114104011e489d6e952cce5cfbe5998692dec0c77b87aedd3fddd9f2b3efce02291082209aa3504685022e4ffd7a000a82a765c515615ce95acae659c3f7765c100ec6e575cf8f822e991025f3b6a6f890c484f181ccfc1583428f5d4e2fe84da039aa04121b40eb32483a0ec6e5bce9f8385d36fa7fb9b1b17c8f31cbfe7a95c45be94520c72b2141a1caa160d1666e24ea94aa11ee7685054159d2ada34d41387c40dc63b8844f0b5c73a4bb19cb3f9de001f2aac1fa23aa209168c004224902e29d22ff1e38abbdb275055c4800610233867311a1491847a62c98f66ac6f14d8e99072f22daa15b68a8108424d6422e24c88e3966fbce4c9d786945b27f0be0103ed13c16004d59a2c4d58df28a87548e9aee2274ab95d60c7193c9a0281fc959ae2a4450364a9e2572c7a2b43438374ef2dd2154012d050514dbec7396578a3130d9d6850066f0ad9d186f2d78cdbbb799b0a202f2c48d3aebbb418310240b112637588574bf54b8efaa4fd9b691dacbf5b305813542bae63a9eee4c4694d967b5494eca8c7ef0933bdc5d90e6a2caa0e3f013b7adce9fa5b03d637561113a30106a71d18c5fd9677058338ad01e91c0b8b743b880182ce19cd9c0e5e2b583fbdda565d3d04cfedad180942133af201b2bc3588e111c680068f489780ce69b192b279768088524f2b3458ea694d3de99a4323bc976ed34eb86b98c51993f6be10f77240c99685cd731991f1582df15aa15a213d583f5313a7806988fb8a0640e336359d9e9933568bf44062214ba19e2a7652a13d8b068ff596b807182189234e9da9f1ceb78c81b28c3ac6fe21e306c58e41d5118952acd6a0c2f56b9e6a5c72f346cdcd6b19a3bf8010010d714f89533b674c90c7189b598eab12a45fb5c75b8253672b863fbcccf5af93b6904119fe9851bf5153ac3a746ae7b9d5698c1dc58f313e70e4707ce9d84bafa2f79fc23fb8c7c1438ef04031a2642fee21060ec69ee47020796ecaa12313ccd333d1b67935047acf2be3bb11aa010dbe656cc755dbe3b772084a7ebc6d5711253b593dfcc0cc8fcd3cafda455512c7f200ec56cbfac0f1d7d34b7fdf0f98fd88a92a7e9cb0e70cc933c0b38a2c823ea0bd76c70c016adb67f47bc2a117a6d40abeea33fa23c2fb867edfb413e4a34fded94ffb3991c46dc7754cd3634ad2af490b857f5a5137126a97e02a8120a485235b6a28ef80bd077ee2b9f2d54fed04595dcbd8ddb6c4bd87334c10cadb2064e856177e7864e669fbe1df154a0142839f7ad2e5b6880bff1da66eece78e315d959f609da670f98befe6c3f45fb42672c9acff7f660000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kenterscheduledlg.cpp b/kmymoney2/dialogs/kenterscheduledlg.cpp index f39f003..47f881f 100644 --- a/kmymoney2/dialogs/kenterscheduledlg.cpp +++ b/kmymoney2/dialogs/kenterscheduledlg.cpp @@ -18,9 +18,9 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qtimer.h> -#include <qwidgetlist.h> -#include <qlabel.h> +#include <tqtimer.h> +#include <tqwidgetlist.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -57,13 +57,13 @@ public: MyMoneySchedule m_schedule; KMyMoneyRegister::Transaction* m_item; - QWidgetList m_tabOrderWidgets; + TQWidgetList m_tabOrderWidgets; bool m_showWarningOnce; KMyMoneyUtils::EnterScheduleResultCodeE m_extendedReturnCode; }; -KEnterScheduleDlg::KEnterScheduleDlg(QWidget *parent, const MyMoneySchedule& schedule) : - KEnterScheduleDlgDecl(parent, "kenterscheduledlg"), +KEnterScheduleDlg::KEnterScheduleDlg(TQWidget *tqparent, const MyMoneySchedule& schedule) : + KEnterScheduleDlgDecl(tqparent, "kenterscheduledlg"), d(new Private) { d->m_schedule = schedule; @@ -76,7 +76,7 @@ KEnterScheduleDlg::KEnterScheduleDlg(QWidget *parent, const MyMoneySchedule& sch buttonSkip->setHidden(true); // make sure, we have a tabbar with the form - KMyMoneyTransactionForm::TabBar* tabbar = m_form->tabBar(m_form->parentWidget()); + KMyMoneyTransactionForm::TabBar* tabbar = m_form->tabBar(m_form->tqparentWidget()); // we never need to see the register m_register->hide(); @@ -103,12 +103,12 @@ KEnterScheduleDlg::KEnterScheduleDlg(QWidget *parent, const MyMoneySchedule& sch m_scheduleName->setText(d->m_schedule.name()); m_type->setText(KMyMoneyUtils::scheduleTypeToString(d->m_schedule.type())); - connect(buttonHelp, SIGNAL(clicked()), this, SLOT(slotShowHelp())); - connect(buttonIgnore, SIGNAL(clicked()), this, SLOT(slotIgnore())); - connect(buttonSkip, SIGNAL(clicked()), this, SLOT(slotSkip())); + connect(buttonHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowHelp())); + connect(buttonIgnore, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotIgnore())); + connect(buttonSkip, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSkip())); // force the initial height to be as small as possible - QTimer::singleShot(0, this, SLOT(slotSetupSize())); + TQTimer::singleShot(0, this, TQT_SLOT(slotSetupSize())); } KEnterScheduleDlg::~KEnterScheduleDlg() @@ -118,7 +118,7 @@ KEnterScheduleDlg::~KEnterScheduleDlg() KMyMoneyUtils::EnterScheduleResultCodeE KEnterScheduleDlg::resultCode(void) const { - if(result() == QDialog::Accepted) + if(result() == TQDialog::Accepted) return d->m_extendedReturnCode; return KMyMoneyUtils::Cancel; } @@ -147,7 +147,7 @@ MyMoneyTransaction KEnterScheduleDlg::transaction(void) try { if (d->m_schedule.type() == MyMoneySchedule::TYPE_LOANPAYMENT) { - KMyMoneyUtils::calculateAutoLoan(d->m_schedule, t, QMap<QString, MyMoneyMoney>()); + KMyMoneyUtils::calculateAutoLoan(d->m_schedule, t, TQMap<TQString, MyMoneyMoney>()); } } catch (MyMoneyException* e) { KMessageBox::detailedError(this, i18n("Unable to load schedule details"), e->what()); @@ -155,17 +155,17 @@ MyMoneyTransaction KEnterScheduleDlg::transaction(void) } t.clearId(); - t.setEntryDate(QDate()); + t.setEntryDate(TQDate()); return t; } -QDate KEnterScheduleDlg::date(const QDate& _date) const +TQDate KEnterScheduleDlg::date(const TQDate& _date) const { - QDate date(_date); + TQDate date(_date); return d->m_schedule.adjustedDate(date, d->m_schedule.weekendOption()); } -void KEnterScheduleDlg::resizeEvent(QResizeEvent* ev) +void KEnterScheduleDlg::resizeEvent(TQResizeEvent* ev) { m_register->resize(KMyMoneyRegister::DetailColumn); m_form->resize(KMyMoneyTransactionForm::ValueColumn1); @@ -175,14 +175,14 @@ void KEnterScheduleDlg::resizeEvent(QResizeEvent* ev) void KEnterScheduleDlg::slotSetupSize(void) { - resize(width(), minimumSizeHint().height()); + resize(width(), tqminimumSizeHint().height()); } int KEnterScheduleDlg::exec(void) { if(d->m_showWarningOnce) { d->m_showWarningOnce = false; - KMessageBox::information(this, QString("<qt>")+i18n("<p>Please check that all the details in the following dialog are correct and press OK.</p><p>Editable data can be changed and can either be applied to just this occurence or for all subsequent occurences for this schedule. (You will be asked what you intend after pressing OK in the following dialog)</p>")+QString("</qt>"), i18n("Enter scheduled transaction"), "EnterScheduleDlgInfo"); + KMessageBox::information(this, TQString("<qt>")+i18n("<p>Please check that all the details in the following dialog are correct and press OK.</p><p>Editable data can be changed and can either be applied to just this occurence or for all subsequent occurences for this schedule. (You will be asked what you intend after pressing OK in the following dialog)</p>")+TQString("</qt>"), i18n("Enter scheduled transaction"), "EnterScheduleDlgInfo"); } return KEnterScheduleDlgDecl::exec(); @@ -191,7 +191,7 @@ int KEnterScheduleDlg::exec(void) TransactionEditor* KEnterScheduleDlg::startEdit(void) { KMyMoneyRegister::SelectedTransactions list(m_register); - TransactionEditor* editor = d->m_item->createEditor(m_form, list, QDate()); + TransactionEditor* editor = d->m_item->createEditor(m_form, list, TQDate()); // check that we use the same transaction commodity in all selected transactions // if not, we need to update this in the editor's list. The user can also bail out @@ -206,18 +206,18 @@ TransactionEditor* KEnterScheduleDlg::startEdit(void) } if(editor) { - connect(editor, SIGNAL(transactionDataSufficient(bool)), buttonOk, SLOT(setEnabled(bool))); - connect(editor, SIGNAL(escapePressed()), buttonCancel, SLOT(animateClick())); - connect(editor, SIGNAL(returnPressed()), buttonOk, SLOT(animateClick())); - - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), editor, SLOT(slotReloadEditWidgets())); - // connect(editor, SIGNAL(finishEdit(const KMyMoneyRegister::SelectedTransactions&)), this, SLOT(slotLeaveEditMode(const KMyMoneyRegister::SelectedTransactions&))); - connect(editor, SIGNAL(createPayee(const QString&, QString&)), kmymoney2, SLOT(slotPayeeNew(const QString&, QString&))); - connect(editor, SIGNAL(createCategory(MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, SLOT(slotCategoryNew(MyMoneyAccount&, const MyMoneyAccount&))); - connect(editor, SIGNAL(createSecurity(MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, SLOT(slotInvestmentNew(MyMoneyAccount&, const MyMoneyAccount&))); - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), editor, SLOT(slotReloadEditWidgets())); - - // create the widgets, place them in the parent and load them with data + connect(editor, TQT_SIGNAL(transactionDataSufficient(bool)), buttonOk, TQT_SLOT(setEnabled(bool))); + connect(editor, TQT_SIGNAL(escapePressed()), buttonCancel, TQT_SLOT(animateClick())); + connect(editor, TQT_SIGNAL(returnPressed()), buttonOk, TQT_SLOT(animateClick())); + + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), editor, TQT_SLOT(slotReloadEditWidgets())); + // connect(editor, TQT_SIGNAL(finishEdit(const KMyMoneyRegister::SelectedTransactions&)), this, TQT_SLOT(slotLeaveEditMode(const KMyMoneyRegister::SelectedTransactions&))); + connect(editor, TQT_SIGNAL(createPayee(const TQString&, TQString&)), kmymoney2, TQT_SLOT(slotPayeeNew(const TQString&, TQString&))); + connect(editor, TQT_SIGNAL(createCategory(MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotCategoryNew(MyMoneyAccount&, const MyMoneyAccount&))); + connect(editor, TQT_SIGNAL(createSecurity(MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotInvestmentNew(MyMoneyAccount&, const MyMoneyAccount&))); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), editor, TQT_SLOT(slotReloadEditWidgets())); + + // create the widgets, place them in the tqparent and load them with data // setup tab order d->m_tabOrderWidgets.clear(); KMyMoneyRegister::Action action = KMyMoneyRegister::ActionWithdrawal; @@ -245,10 +245,10 @@ TransactionEditor* KEnterScheduleDlg::startEdit(void) // if it's not a check, then we need to clear // a possibly assigned check number - if(d->m_schedule.paymentType() != MyMoneySchedule::STYPE_WRITECHEQUE) { - QWidget* w = editor->haveWidget("number"); + if(d->m_schedule.paymentType() != MyMoneySchedule::STYPE_WRITECHETQUE) { + TQWidget* w = editor->haveWidget("number"); if(w) - dynamic_cast<kMyMoneyLineEdit*>(w)->loadText(QString()); + dynamic_cast<kMyMoneyLineEdit*>(w)->loadText(TQString()); } Q_ASSERT(!d->m_tabOrderWidgets.isEmpty()); @@ -259,17 +259,17 @@ TransactionEditor* KEnterScheduleDlg::startEdit(void) d->m_tabOrderWidgets.append(buttonHelp); // install event filter in all taborder widgets - for(QWidget* w = d->m_tabOrderWidgets.first(); w; w = d->m_tabOrderWidgets.next()) { + for(TQWidget* w = d->m_tabOrderWidgets.first(); w; w = d->m_tabOrderWidgets.next()) { w->installEventFilter(this); w->installEventFilter(editor); } // 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 - QWidget* focusWidget = editor->firstWidget(); - if(!focusWidget) - focusWidget = d->m_tabOrderWidgets.first(); - focusWidget->setFocus(); + TQWidget* tqfocusWidget = editor->firstWidget(); + if(!tqfocusWidget) + tqfocusWidget = d->m_tabOrderWidgets.first(); + tqfocusWidget->setFocus(); // Make sure, we use the adjusted date kMyMoneyDateInput* dateEdit = dynamic_cast<kMyMoneyDateInput*>(editor->haveWidget("postdate")); @@ -286,13 +286,13 @@ bool KEnterScheduleDlg::focusNextPrevChild(bool next) bool rc = false; // qDebug("KGlobalLedgerView::focusNextPrevChild(editmode=%s)", m_inEditMode ? "true" : "false"); - QWidget *w = 0; - QWidget *currentWidget; + TQWidget *w = 0; + TQWidget *currentWidget; - w = qApp->focusWidget(); - while(w && d->m_tabOrderWidgets.find(w) == -1) { - // qDebug("'%s' not in list, use parent", w->className()); - w = w->parentWidget(); + w = tqApp->tqfocusWidget(); + while(w && d->m_tabOrderWidgets.tqfind(w) == -1) { + // qDebug("'%s' not in list, use tqparent", w->className()); + w = w->tqparentWidget(); } // if(w) qDebug("tab order is at '%s'", w->className()); currentWidget = d->m_tabOrderWidgets.current(); @@ -304,7 +304,7 @@ bool KEnterScheduleDlg::focusNextPrevChild(bool next) } if(w != currentWidget - && ((w->focusPolicy() & TabFocus) == TabFocus) + && ((w->focusPolicy() & TQ_TabFocus) == TQ_TabFocus) && w->isVisible() && w->isEnabled()) { // qDebug("Selecting '%s' as focus", w->className()); w->setFocus(); diff --git a/kmymoney2/dialogs/kenterscheduledlg.h b/kmymoney2/dialogs/kenterscheduledlg.h index 0e14ad4..8f45d75 100644 --- a/kmymoney2/dialogs/kenterscheduledlg.h +++ b/kmymoney2/dialogs/kenterscheduledlg.h @@ -39,8 +39,9 @@ class TransactionEditor; class KEnterScheduleDlg : public KEnterScheduleDlgDecl { Q_OBJECT + TQ_OBJECT public: - KEnterScheduleDlg(QWidget *parent, const MyMoneySchedule& schedule); + KEnterScheduleDlg(TQWidget *tqparent, const MyMoneySchedule& schedule); ~KEnterScheduleDlg(); TransactionEditor* startEdit(void); @@ -68,9 +69,9 @@ protected: * This method returns the adjusts @a _date according to * the setting of the schedule's weekend option. */ - QDate date(const QDate& _date) const; + TQDate date(const TQDate& _date) const; - void resizeEvent(QResizeEvent* ev); + void resizeEvent(TQResizeEvent* ev); public slots: int exec(void); diff --git a/kmymoney2/dialogs/kenterscheduledlgdecl.ui b/kmymoney2/dialogs/kenterscheduledlgdecl.ui index 3efed94..f81cdf8 100644 --- a/kmymoney2/dialogs/kenterscheduledlgdecl.ui +++ b/kmymoney2/dialogs/kenterscheduledlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KEnterScheduleDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KEnterScheduleDlgDecl</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -45,7 +45,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>70</width> <height>0</height> @@ -59,7 +59,7 @@ <string>Name:</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_scheduleName</cstring> </property> @@ -67,7 +67,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -79,7 +79,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>70</width> <height>0</height> @@ -93,7 +93,7 @@ <string>Type:</string> </property> </widget> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>m_type</cstring> </property> @@ -167,7 +167,7 @@ <number>12</number> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame4</cstring> </property> @@ -219,9 +219,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -245,7 +245,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>190</width> <height>20</height> @@ -326,5 +326,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp index 4111bfa..f5014d0 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp +++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp @@ -24,13 +24,13 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlabel.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qtimer.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqtimer.h> +#include <tqlayout.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -61,8 +61,8 @@ #define ID_COL 4 #define SOURCE_COL 5 -KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(QWidget *parent, const QString& securityId) : - KEquityPriceUpdateDlgDecl(parent), +KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(TQWidget *tqparent, const TQString& securityId) : + KEquityPriceUpdateDlgDecl(tqparent), m_fUpdateAll(false) { lvEquityList->setRootIsDecorated(false); @@ -78,8 +78,8 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(QWidget *parent, const QString& sec lvEquityList->setColumnWidth(ID_COL, 0); lvEquityList->setMultiSelection(true); - lvEquityList->setColumnWidthMode(SYMBOL_COL, QListView::Maximum); - lvEquityList->setColumnWidthMode(ID_COL, QListView::Manual); + lvEquityList->setColumnWidthMode(SYMBOL_COL, TQListView::Maximum); + lvEquityList->setColumnWidthMode(ID_COL, TQListView::Manual); lvEquityList->setAllColumnsShowFocus(true); btnUpdateAll->setEnabled(false); @@ -92,7 +92,7 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(QWidget *parent, const QString& sec // send in securityId == "XXX YYY" to get a single-shot update for XXX to YYY. // for consistency reasons, this accepts the same delimiters as WebPriceQuote::launch() - QRegExp splitrx("([0-9a-z\\.]+)[^a-z0-9]+([0-9a-z\\.]+)",false /*case sensitive*/); + TQRegExp splitrx("([0-9a-z\\.]+)[^a-z0-9]+([0-9a-z\\.]+)",false /*case sensitive*/); MyMoneySecurityPair currencyIds; if ( splitrx.search(securityId) != -1 ) currencyIds = MyMoneySecurityPair(splitrx.cap(1).utf8(),splitrx.cap(2).utf8()); @@ -104,7 +104,7 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(QWidget *parent, const QString& sec if ( file->security( pair.first ).isCurrency() && ( securityId.isEmpty() || ( pair == currencyIds ) ) ) { const MyMoneyPriceEntries& entries = (*it_price); - if(entries.count() > 0 && entries.begin().key() <= QDate::currentDate()) { + if(entries.count() > 0 && entries.begin().key() <= TQDate::tqcurrentDate()) { addPricePair(pair); btnUpdateAll->setEnabled(true); } @@ -115,8 +115,8 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(QWidget *parent, const QString& sec // Add each investment // - QValueList<MyMoneySecurity> securities = file->securityList(); - for(QValueList<MyMoneySecurity>::ConstIterator it = securities.begin(); it != securities.end(); ++it) + TQValueList<MyMoneySecurity> securities = file->securityList(); + for(TQValueList<MyMoneySecurity>::ConstIterator it = securities.begin(); it != securities.end(); ++it) { if ( !(*it).isCurrency() && ( securityId.isEmpty() || ( (*it).id() == securityId ) ) @@ -133,33 +133,33 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(QWidget *parent, const QString& sec addPricePair(currencyIds, true); } - connect(btnOK, SIGNAL(clicked()), this, SLOT(accept())); - connect(btnCancel, SIGNAL(clicked()), this, SLOT(reject())); - connect(btnUpdateSelected, SIGNAL(clicked()), this, SLOT(slotUpdateSelectedClicked())); - connect(btnUpdateAll, SIGNAL(clicked()), this, SLOT(slotUpdateAllClicked())); + connect(btnOK, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect(btnCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(btnUpdateSelected, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpdateSelectedClicked())); + connect(btnUpdateAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpdateAllClicked())); - connect(&m_webQuote,SIGNAL(quote(const QString&, const QString&,const QDate&, const double&)), - this,SLOT(slotReceivedQuote(const QString&, const QString&,const QDate&, const double&))); - connect(&m_webQuote,SIGNAL(failed(const QString&, const QString&)), - this,SLOT(slotQuoteFailed(const QString&, const QString&))); - connect(&m_webQuote,SIGNAL(status(const QString&)), - this,SLOT(logStatusMessage(const QString&))); - connect(&m_webQuote,SIGNAL(error(const QString&)), - this,SLOT(logErrorMessage(const QString&))); + connect(&m_webQuote,TQT_SIGNAL(quote(const TQString&, const TQString&,const TQDate&, const double&)), + this,TQT_SLOT(slotReceivedQuote(const TQString&, const TQString&,const TQDate&, const double&))); + connect(&m_webQuote,TQT_SIGNAL(failed(const TQString&, const TQString&)), + this,TQT_SLOT(slotQuoteFailed(const TQString&, const TQString&))); + connect(&m_webQuote,TQT_SIGNAL(status(const TQString&)), + this,TQT_SLOT(logStatusMessage(const TQString&))); + connect(&m_webQuote,TQT_SIGNAL(error(const TQString&)), + this,TQT_SLOT(logErrorMessage(const TQString&))); - connect(lvEquityList, SIGNAL(selectionChanged()), this, SLOT(slotUpdateSelection())); + connect(lvEquityList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateSelection())); // Not implemented yet. btnConfigure->hide(); - //connect(btnConfigure, SIGNAL(clicked()), this, SLOT(slotConfigureClicked())); + //connect(btnConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigureClicked())); if ( !securityId.isEmpty() ) { btnUpdateSelected->hide(); btnUpdateAll->hide(); - // delete layout1; + // delete tqlayout1; - QTimer::singleShot(100,this,SLOT(slotUpdateAllClicked())); + TQTimer::singleShot(100,this,TQT_SLOT(slotUpdateAllClicked())); } // Hide OK button until we have received the first update @@ -183,19 +183,19 @@ void KEquityPriceUpdateDlg::addPricePair(const MyMoneySecurityPair& pair, bool d { MyMoneyFile* file = MyMoneyFile::instance(); - QString symbol = QString("%1 > %2").arg(pair.first,pair.second); - QString id = QString("%1 %2").arg(pair.first,pair.second); - if ( ! lvEquityList->findItem(id,ID_COL,Qt::ExactMatch) ) + TQString symbol = TQString("%1 > %2").tqarg(pair.first,pair.second); + TQString id = TQString("%1 %2").tqarg(pair.first,pair.second); + if ( ! lvEquityList->tqfindItem(id,ID_COL,TQt::ExactMatch) ) { MyMoneyPrice pr = file->price(pair.first,pair.second); if(pr.source() != "KMyMoney") { bool keep = true; if((pair.first == file->baseCurrency().id()) || (pair.second == file->baseCurrency().id())) { - const QString& foreignCurrency = file->foreignCurrency(pair.first, pair.second); + const TQString& foreignCurrency = file->foreignCurrency(pair.first, pair.second); // check that the foreign currency is still in use - QValueList<MyMoneyAccount>::const_iterator it_a; - QValueList<MyMoneyAccount> list; + TQValueList<MyMoneyAccount>::const_iterator it_a; + TQValueList<MyMoneyAccount> list; file->accountList(list); for(it_a = list.begin(); !dontCheckExistance && it_a != list.end(); ++it_a) { // if it's an account denominated in the foreign currency @@ -219,7 +219,7 @@ void KEquityPriceUpdateDlg::addPricePair(const MyMoneySecurityPair& pair, bool d if(keep) { KListViewItem* item = new KListViewItem(lvEquityList, symbol, - i18n("%1 units in %2").arg(pair.first,pair.second)); + i18n("%1 units in %2").tqarg(pair.first,pair.second)); if(pr.isValid()) { item->setText(PRICE_COL, pr.rate(pair.second).formatMoney(file->currency(pair.second).tradingSymbol(), KMyMoneyGlobalSettings::pricePrecision())); item->setText(DATE_COL, pr.date().toString(Qt::ISODate)); @@ -235,13 +235,13 @@ void KEquityPriceUpdateDlg::addInvestment(const MyMoneySecurity& inv) { MyMoneyFile* file = MyMoneyFile::instance(); - QString symbol = inv.tradingSymbol(); - QString id = inv.id(); - if ( ! lvEquityList->findItem(id, ID_COL, Qt::ExactMatch) ) + TQString symbol = inv.tradingSymbol(); + TQString id = inv.id(); + if ( ! lvEquityList->tqfindItem(id, ID_COL, TQt::ExactMatch) ) { // check that the security is still in use - QValueList<MyMoneyAccount>::const_iterator it_a; - QValueList<MyMoneyAccount> list; + TQValueList<MyMoneyAccount>::const_iterator it_a; + TQValueList<MyMoneyAccount> list; file->accountList(list); for(it_a = list.begin(); it_a != list.end(); ++it_a) { if((*it_a).isInvest() @@ -260,7 +260,7 @@ void KEquityPriceUpdateDlg::addInvestment(const MyMoneySecurity& inv) } item->setText(ID_COL,id); if (inv.value("kmm-online-quote-system") == "Finance::Quote") - item->setText(SOURCE_COL, QString("Finance::Quote %1").arg( inv.value("kmm-online-source"))); + item->setText(SOURCE_COL, TQString("Finance::Quote %1").tqarg( inv.value("kmm-online-source"))); else item->setText(SOURCE_COL, inv.value("kmm-online-source")); @@ -275,40 +275,40 @@ void KEquityPriceUpdateDlg::addInvestment(const MyMoneySecurity& inv) } } -void KEquityPriceUpdateDlg::logErrorMessage(const QString& message) +void KEquityPriceUpdateDlg::logErrorMessage(const TQString& message) { - logStatusMessage(QString("<font color=\"red\"><b>") + message + QString("</b></font>")); + logStatusMessage(TQString("<font color=\"red\"><b>") + message + TQString("</b></font>")); } -void KEquityPriceUpdateDlg::logStatusMessage(const QString& message) +void KEquityPriceUpdateDlg::logStatusMessage(const TQString& message) { - lbStatus->append(message); + lbtqStatus->append(message); } -MyMoneyPrice KEquityPriceUpdateDlg::price(const QString& id) const +MyMoneyPrice KEquityPriceUpdateDlg::price(const TQString& id) const { MyMoneyPrice price; - QListViewItem* item; + TQListViewItem* item; - if((item = lvEquityList->findItem(id, ID_COL, Qt::ExactMatch)) != 0) { + if((item = lvEquityList->tqfindItem(id, ID_COL, TQt::ExactMatch)) != 0) { MyMoneyMoney rate(item->text(PRICE_COL)); if ( !rate.isZero() ) { - QString id = item->text(ID_COL).utf8(); + TQString id = item->text(ID_COL).utf8(); // if the ID has a space, then this is TWO ID's, so it's a currency quote - if ( QString(id).contains(" ") ) + if ( TQString(id).tqcontains(" ") ) { - QStringList ids = QStringList::split(" ",QString(id)); - QString fromid = ids[0].utf8(); - QString toid = ids[1].utf8(); - price = MyMoneyPrice(fromid,toid,QDate().fromString(item->text(DATE_COL), Qt::ISODate),rate,item->text(SOURCE_COL)); + TQStringList ids = TQStringList::split(" ",TQString(id)); + TQString fromid = ids[0].utf8(); + TQString toid = ids[1].utf8(); + price = MyMoneyPrice(fromid,toid,TQDate().fromString(item->text(DATE_COL), Qt::ISODate),rate,item->text(SOURCE_COL)); } else // otherwise, it's a security quote { MyMoneySecurity security = MyMoneyFile::instance()->security(id); - price = MyMoneyPrice(id, security.tradingCurrency(), QDate().fromString(item->text(DATE_COL), Qt::ISODate), rate, item->text(SOURCE_COL)); + price = MyMoneyPrice(id, security.tradingCurrency(), TQDate().fromString(item->text(DATE_COL), Qt::ISODate), rate, item->text(SOURCE_COL)); } } } @@ -320,11 +320,11 @@ void KEquityPriceUpdateDlg::storePrices(void) // update the new prices into the equities MyMoneyFile* file = MyMoneyFile::instance(); - QValueList<MyMoneySecurity> equities = file->securityList(); + TQValueList<MyMoneySecurity> equities = file->securityList(); - QListViewItem* item = lvEquityList->firstChild(); + TQListViewItem* item = lvEquityList->firstChild(); MyMoneyFileTransaction ft; - QString name; + TQString name; try { while ( item ) { @@ -334,16 +334,16 @@ void KEquityPriceUpdateDlg::storePrices(void) MyMoneyMoney rate(item->text(PRICE_COL)); if ( !rate.isZero() ) { - QString id = item->text(ID_COL).utf8(); + TQString id = item->text(ID_COL).utf8(); // if the ID has a space, then this is TWO ID's, so it's a currency quote - if ( QString(id).contains(" ") ) + if ( TQString(id).tqcontains(" ") ) { - QStringList ids = QStringList::split(" ",QString(id)); - QString fromid = ids[0].utf8(); - QString toid = ids[1].utf8(); - name = QString("%1 --> %2").arg(fromid).arg(toid); - MyMoneyPrice price(fromid,toid,QDate().fromString(item->text(DATE_COL), Qt::ISODate),rate,item->text(SOURCE_COL)); + TQStringList ids = TQStringList::split(" ",TQString(id)); + TQString fromid = ids[0].utf8(); + TQString toid = ids[1].utf8(); + name = TQString("%1 --> %2").tqarg(fromid).tqarg(toid); + MyMoneyPrice price(fromid,toid,TQDate().fromString(item->text(DATE_COL), Qt::ISODate),rate,item->text(SOURCE_COL)); file->addPrice(price); } else @@ -351,7 +351,7 @@ void KEquityPriceUpdateDlg::storePrices(void) { MyMoneySecurity security = MyMoneyFile::instance()->security(id); name = security.name(); - MyMoneyPrice price(id, security.tradingCurrency(), QDate().fromString(item->text(DATE_COL), Qt::ISODate), rate, item->text(SOURCE_COL)); + MyMoneyPrice price(id, security.tradingCurrency(), TQDate().fromString(item->text(DATE_COL), Qt::ISODate), rate, item->text(SOURCE_COL)); // TODO (Ace) Better handling of the case where there is already a price // for this date. Currently, it just overrides the old value. Really it @@ -374,7 +374,7 @@ void KEquityPriceUpdateDlg::slotUpdateSelection(void) { btnUpdateSelected->setEnabled(false); - QListViewItem* item = lvEquityList->firstChild(); + TQListViewItem* item = lvEquityList->firstChild(); while ( item && !item->isSelected()) item = item->nextSibling(); @@ -384,7 +384,7 @@ void KEquityPriceUpdateDlg::slotUpdateSelection(void) void KEquityPriceUpdateDlg::slotUpdateSelectedClicked(void) { - QListViewItem* item = lvEquityList->firstChild(); + TQListViewItem* item = lvEquityList->firstChild(); int skipCnt = 1; while ( item && !item->isSelected()) { @@ -403,7 +403,7 @@ void KEquityPriceUpdateDlg::slotUpdateSelectedClicked(void) void KEquityPriceUpdateDlg::slotUpdateAllClicked(void) { - QListViewItem* item = lvEquityList->firstChild(); + TQListViewItem* item = lvEquityList->firstChild(); if ( item ) { prgOnlineProgress->setTotalSteps(1+lvEquityList->childCount()); @@ -415,16 +415,16 @@ void KEquityPriceUpdateDlg::slotUpdateAllClicked(void) logErrorMessage("Security list is empty."); } -void KEquityPriceUpdateDlg::slotQuoteFailed(const QString& _id, const QString& _symbol) +void KEquityPriceUpdateDlg::slotQuoteFailed(const TQString& _id, const TQString& _symbol) { - QListViewItem* item = lvEquityList->findItem(_id,ID_COL,Qt::ExactMatch); + TQListViewItem* item = lvEquityList->tqfindItem(_id,ID_COL,TQt::ExactMatch); // Give the user some options int result; - if(_id.contains(" ")) { - result = KMessageBox::warningContinueCancel(this, i18n("Failed to retrieve an exchange rate for %1 from %2. It will be skipped this time.").arg(_symbol, item->text(SOURCE_COL)), i18n("Price Update Failed")); + if(_id.tqcontains(" ")) { + result = KMessageBox::warningContinueCancel(this, i18n("Failed to retrieve an exchange rate for %1 from %2. It will be skipped this time.").tqarg(_symbol, item->text(SOURCE_COL)), i18n("Price Update Failed")); } else { - result = KMessageBox::questionYesNoCancel(this, QString("<qt>%1</qt>").arg(i18n("Failed to retrieve a quote for %1 from %2. Press <b>No</b> to remove the online price source from this security permanently, <b>Yes</b> to continue updating this security during future price updates or <b>Cancel</b> to stop the current update operation.").arg(_symbol, item->text(SOURCE_COL))), i18n("Price Update Failed"), KStdGuiItem::yes(), KStdGuiItem::no()); + result = KMessageBox::questionYesNoCancel(this, TQString("<qt>%1</qt>").tqarg(i18n("Failed to retrieve a quote for %1 from %2. Press <b>No</b> to remove the online price source from this security permanently, <b>Yes</b> to continue updating this security during future price updates or <b>Cancel</b> to stop the current update operation.").tqarg(_symbol, item->text(SOURCE_COL))), i18n("Price Update Failed"), KStdGuiItem::yes(), KStdGuiItem::no()); } if ( result == KMessageBox::No ) @@ -437,14 +437,14 @@ void KEquityPriceUpdateDlg::slotQuoteFailed(const QString& _id, const QString& _ MyMoneySecurity security = MyMoneyFile::instance()->security(_id.utf8()); // Set the quote source to blank - security.setValue("kmm-online-source",QString()); - security.setValue("kmm-online-quote-system",QString()); + security.setValue("kmm-online-source",TQString()); + security.setValue("kmm-online-quote-system",TQString()); // Re-commit the security MyMoneyFile::instance()->modifySecurity(security); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::error(this, QString("<qt>")+i18n("Cannot update security <b>%1</b>: %2").arg(_symbol, e->what())+QString("</qt>"), i18n("Price Update Failed")); + KMessageBox::error(this, TQString("<qt>")+i18n("Cannot update security <b>%1</b>: %2").tqarg(_symbol, e->what())+TQString("</qt>"), i18n("Price Update Failed")); delete e; } } @@ -452,7 +452,7 @@ void KEquityPriceUpdateDlg::slotQuoteFailed(const QString& _id, const QString& _ // As long as the user doesn't want to cancel, move on! if ( result != KMessageBox::Cancel ) { - QListViewItem* next = NULL; + TQListViewItem* next = NULL; prgOnlineProgress->advance(1); item->listView()->setSelected(item, false); @@ -482,25 +482,25 @@ void KEquityPriceUpdateDlg::slotQuoteFailed(const QString& _id, const QString& _ } } -void KEquityPriceUpdateDlg::slotReceivedQuote(const QString& _id, const QString& _symbol,const QDate& _date, const double& _price) +void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQString& _symbol,const TQDate& _date, const double& _price) { - QListViewItem* item = lvEquityList->findItem(_id,ID_COL,Qt::ExactMatch); - QListViewItem* next = NULL; + TQListViewItem* item = lvEquityList->tqfindItem(_id,ID_COL,TQt::ExactMatch); + TQListViewItem* next = NULL; if ( item ) { if ( _price > 0.0f && _date.isValid() ) { - QDate date = _date; - if ( date > QDate::currentDate() ) - date = QDate::currentDate(); + TQDate date = _date; + if ( date > TQDate::tqcurrentDate() ) + date = TQDate::tqcurrentDate(); double price = _price; - QString id = _id.utf8(); + TQString id = _id.utf8(); MyMoneySecurity sec; - if ( _id.contains(" ") == 0) { + if ( _id.tqcontains(" ") == 0) { MyMoneySecurity security = MyMoneyFile::instance()->security(id); - QString factor = security.value("kmm-online-factor"); + TQString factor = security.value("kmm-online-factor"); if(!factor.isEmpty()) { price *= MyMoneyMoney(factor).toDouble(); } @@ -513,7 +513,7 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const QString& _id, const QString& } } else { - QRegExp splitrx("([0-9a-z\\.]+)[^a-z0-9]+([0-9a-z\\.]+)",false /*case sensitive*/); + TQRegExp splitrx("([0-9a-z\\.]+)[^a-z0-9]+([0-9a-z\\.]+)",false /*case sensitive*/); if ( splitrx.search(_id) != -1 ) { try { sec = MyMoneyFile::instance()->security(splitrx.cap(2).utf8()); @@ -525,13 +525,13 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const QString& _id, const QString& } item->setText(PRICE_COL, KGlobal::locale()->formatMoney(price, sec.tradingSymbol(), KMyMoneyGlobalSettings::pricePrecision())); item->setText(DATE_COL, date.toString(Qt::ISODate)); - logStatusMessage(i18n("Price for %1 updated (id %2)").arg(_symbol,_id)); + logStatusMessage(i18n("Price for %1 updated (id %2)").tqarg(_symbol,_id)); // make sure to make OK button available btnOK->setEnabled(true); } else { - logErrorMessage(i18n("Received an invalid price for %1, unable to update.").arg(_symbol)); + logErrorMessage(i18n("Received an invalid price for %1, unable to update.").tqarg(_symbol)); } prgOnlineProgress->advance(1); @@ -551,7 +551,7 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const QString& _id, const QString& } else { - logErrorMessage(i18n("Received a price for %1 (id %2), but this symbol is not on the list! Aborting entire update.").arg(_symbol,_id)); + logErrorMessage(i18n("Received a price for %1 (id %2), but this symbol is not on the list! Aborting entire update.").tqarg(_symbol,_id)); } if (next) diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.h b/kmymoney2/dialogs/kequitypriceupdatedlg.h index 7dbc6a5..a5a0bac 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlg.h +++ b/kmymoney2/dialogs/kequitypriceupdatedlg.h @@ -20,16 +20,16 @@ * * ***************************************************************************/ -#ifndef KEQUITYPRICEUPDATEDIALOG_H -#define KEQUITYPRICEUPDATEDIALOG_H +#ifndef KETQUITYPRICEUPDATEDIALOG_H +#define KETQUITYPRICEUPDATEDIALOG_H // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> -#include <qpair.h> -#include <qdatastream.h> -class QListViewItem; +#include <tqwidget.h> +#include <tqpair.h> +#include <tqdatastream.h> +class TQListViewItem; // ---------------------------------------------------------------------------- // KDE Includes @@ -51,21 +51,22 @@ class QListViewItem; class KEquityPriceUpdateDlg : public KEquityPriceUpdateDlgDecl { Q_OBJECT + TQ_OBJECT public: - KEquityPriceUpdateDlg(QWidget *parent, const QString& securityId = QString()); + KEquityPriceUpdateDlg(TQWidget *tqparent, const TQString& securityId = TQString()); ~KEquityPriceUpdateDlg(); void storePrices(void); - MyMoneyPrice price(const QString& id) const; + MyMoneyPrice price(const TQString& id) const; protected slots: void slotUpdateSelectedClicked(void); void slotUpdateAllClicked(void); void slotUpdateSelection(void); - void logStatusMessage(const QString&); - void logErrorMessage(const QString&); - void slotReceivedQuote(const QString&, const QString&,const QDate&, const double&); - void slotQuoteFailed(const QString& _id, const QString& _symbol); + void logStatusMessage(const TQString&); + void logErrorMessage(const TQString&); + void slotReceivedQuote(const TQString&, const TQString&,const TQDate&, const double&); + void slotQuoteFailed(const TQString& _id, const TQString& _symbol); protected: void addPricePair(const MyMoneySecurityPair& pair, bool dontCheckExistance = false); diff --git a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui index a06c44d..91a1fc6 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui +++ b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KEquityPriceUpdateDlgDecl</class> <author>Kevin Tambascio <ktambascio@users.sourceforge.net></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>kequitypriceupdatedlgdecl</cstring> </property> @@ -24,7 +24,7 @@ <property name="name"> <cstring>lvEquityList</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>350</width> <height>0</height> @@ -49,9 +49,9 @@ <string>List of known Equities, and the date they were last updated on.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -100,17 +100,17 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> - <string>Status:</string> + <string>tqStatus:</string> </property> </widget> <widget class="KTextEdit"> <property name="name"> - <cstring>lbStatus</cstring> + <cstring>lbtqStatus</cstring> </property> <property name="textFormat"> <enum>LogText</enum> @@ -121,9 +121,9 @@ <cstring>prgOnlineProgress</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -139,7 +139,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>20</height> @@ -175,5 +175,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kexportdlg.cpp b/kmymoney2/dialogs/kexportdlg.cpp index c00e3cf..701d138 100644 --- a/kmymoney2/dialogs/kexportdlg.cpp +++ b/kmymoney2/dialogs/kexportdlg.cpp @@ -20,20 +20,16 @@ // ---------------------------------------------------------------------------- // QT Headers -#include <qlineedit.h> -#include <qlabel.h> -#include <qpixmap.h> +#include <tqlineedit.h> +#include <tqlabel.h> +#include <tqpixmap.h> // ---------------------------------------------------------------------------- // KDE Headers #include <kglobal.h> #include <klocale.h> -#if QT_VERSION > 300 #include <kstandarddirs.h> -#else -#include <kstddirs.h> -#endif #include <kmessagebox.h> #include <kfiledialog.h> #include <kpushbutton.h> @@ -49,8 +45,8 @@ #include "../widgets/kmymoneyaccountcombo.h" #include "../kmymoneyutils.h" -KExportDlg::KExportDlg(QWidget *parent) - : KExportDlgDecl(parent, 0, true) +KExportDlg::KExportDlg(TQWidget *tqparent) + : KExportDlgDecl(tqparent, 0, true) { // Set (almost) all the last used options readConfig(); @@ -63,40 +59,40 @@ KExportDlg::KExportDlg(QWidget *parent) m_qbuttonCancel->setGuiItem(KStdGuiItem::cancel()); KGuiItem okButtenItem( i18n( "&Export" ), - QIconSet(il->loadIcon("fileexport", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("fileexport", KIcon::Small, KIcon::SizeSmall)), i18n("Start operation"), i18n("Use this to start the export operation")); m_qbuttonOk->setGuiItem(okButtenItem); KGuiItem browseButtenItem( i18n( "&Browse..." ), - QIconSet(il->loadIcon("fileopen", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("fileopen", KIcon::Small, KIcon::SizeSmall)), i18n("Select filename"), i18n("Use this to select a filename to export to")); m_qbuttonBrowse->setGuiItem(browseButtenItem); KGuiItem newButtenItem( i18n( "&New..." ), - QIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), i18n("Create a new profile"), i18n("Use this to open the profile editor")); m_profileEditorButton->setGuiItem(newButtenItem); // connect the buttons to their functionality - connect(m_qbuttonBrowse, SIGNAL( clicked() ), this, SLOT( slotBrowse() ) ); - connect(m_profileEditorButton, SIGNAL(clicked()), this, SLOT(slotNewProfile())); - connect(m_qbuttonOk, SIGNAL(clicked()), this, SLOT(slotOkClicked())); - connect(m_qbuttonCancel, SIGNAL(clicked()), this, SLOT(reject())); + connect(m_qbuttonBrowse, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowse() ) ); + connect(m_profileEditorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewProfile())); + connect(m_qbuttonOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOkClicked())); + connect(m_qbuttonCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); // connect the change signals to the check slot and perform initial check - connect(m_qlineeditFile, SIGNAL(textChanged(const QString&)), this, SLOT(checkData())); - connect(m_qcheckboxAccount, SIGNAL(toggled(bool)), this, SLOT(checkData())); - connect(m_qcheckboxCategories, SIGNAL(toggled(bool)), this, SLOT(checkData())); - connect(m_accountComboBox, SIGNAL(accountSelected(const QString&)), this, SLOT(checkData(const QString&))); - connect(m_profileComboBox, SIGNAL(highlighted(int)), this, SLOT(checkData())); - connect(m_kmymoneydateStart, SIGNAL(dateChanged(const QDate&)), this, SLOT(checkData())); - connect(m_kmymoneydateEnd, SIGNAL(dateChanged(const QDate&)), this, SLOT(checkData())); - - checkData(QString()); + connect(m_qlineeditFile, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(checkData())); + connect(m_qcheckboxAccount, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkData())); + connect(m_qcheckboxCategories, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkData())); + connect(m_accountComboBox, TQT_SIGNAL(accountSelected(const TQString&)), this, TQT_SLOT(checkData(const TQString&))); + connect(m_profileComboBox, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(checkData())); + connect(m_kmymoneydateStart, TQT_SIGNAL(dateChanged(const TQDate&)), this, TQT_SLOT(checkData())); + connect(m_kmymoneydateEnd, TQT_SIGNAL(dateChanged(const TQDate&)), this, TQT_SLOT(checkData())); + + checkData(TQString()); } KExportDlg::~KExportDlg() @@ -105,15 +101,15 @@ KExportDlg::~KExportDlg() void KExportDlg::slotBrowse() { - QString newName(KFileDialog::getSaveFileName(QString::null,"*.QIF")); - KMyMoneyUtils::appendCorrectFileExt(newName, QString("qif")); + TQString newName(KFileDialog::getSaveFileName(TQString(),"*.TQIF")); + KMyMoneyUtils::appendCorrectFileExt(newName, TQString("qif")); if (!newName.isEmpty()) m_qlineeditFile->setText(newName); } void KExportDlg::slotNewProfile(void) { - MyMoneyQifProfileEditor* editor = new MyMoneyQifProfileEditor(true, this, "QIF Profile Editor"); + MyMoneyQifProfileEditor* editor = new MyMoneyQifProfileEditor(true, this, "TQIF Profile Editor"); if(editor->exec()) { m_profileComboBox->setCurrentText(editor->selectedProfile()); loadProfiles(); @@ -129,11 +125,11 @@ void KExportDlg::loadProfiles(const bool selectLast) edit->slotOk(); delete edit; - QString current = m_profileComboBox->currentText(); + TQString current = m_profileComboBox->currentText(); m_profileComboBox->clear(); - QStringList list; + TQStringList list; KConfig* config = KGlobal::config(); config->setGroup("Profiles"); @@ -147,7 +143,7 @@ void KExportDlg::loadProfiles(const bool selectLast) } m_profileComboBox->setCurrentItem(0); - if(list.contains(current) > 0) + if(list.tqcontains(current) > 0) m_profileComboBox->setCurrentText(current); } @@ -178,19 +174,19 @@ void KExportDlg::writeConfig(void) kconfig->writeEntry("KExportDlg_LastFile", m_qlineeditFile->text()); kconfig->writeEntry("KExportDlg_AccountOpt", m_qcheckboxAccount->isChecked()); kconfig->writeEntry("KExportDlg_CatOpt", m_qcheckboxCategories->isChecked()); - kconfig->writeEntry("KExportDlg_StartDate", QDateTime(m_kmymoneydateStart->date())); - kconfig->writeEntry("KExportDlg_EndDate", QDateTime(m_kmymoneydateEnd->date())); + kconfig->writeEntry("KExportDlg_StartDate", TQDateTime(m_kmymoneydateStart->date())); + kconfig->writeEntry("KExportDlg_EndDate", TQDateTime(m_kmymoneydateEnd->date())); kconfig->writeEntry("KExportDlg_LastProfile", m_profileComboBox->currentText()); kconfig->sync(); } -void KExportDlg::checkData(const QString& accountId) +void KExportDlg::checkData(const TQString& accountId) { bool okEnabled = false; if(!m_qlineeditFile->text().isEmpty()) { - QString strFile(m_qlineeditFile->text()); - if(KMyMoneyUtils::appendCorrectFileExt(strFile, QString("qif"))) + TQString strFile(m_qlineeditFile->text()); + if(KMyMoneyUtils::appendCorrectFileExt(strFile, TQString("qif"))) m_qlineeditFile->setText(strFile); } @@ -200,8 +196,8 @@ void KExportDlg::checkData(const QString& accountId) account = file->account(accountId); if(m_lastAccount != accountId) { MyMoneyTransactionFilter filter(accountId); - QValueList<MyMoneyTransaction> list = file->transactionList(filter); - QValueList<MyMoneyTransaction>::Iterator it; + TQValueList<MyMoneyTransaction> list = file->transactionList(filter); + TQValueList<MyMoneyTransaction>::Iterator it; if(!list.isEmpty()) { it = list.begin(); @@ -228,14 +224,14 @@ void KExportDlg::checkData(const QString& accountId) void KExportDlg::loadAccounts(void) { /* - QStringList strList; + TQStringList strList; try { MyMoneyFile *file = MyMoneyFile::instance(); // read all account items from the MyMoneyFile objects and add them to the listbox - addCategories(strList, file->liability().id(), QString()); - addCategories(strList, file->asset().id(), QString()); + addCategories(strList, file->liability().id(), TQString()); + addCategories(strList, file->asset().id(), TQString()); } catch (MyMoneyException *e) { qDebug("Exception '%s' thrown in %s, line %ld caught in KExportDlg::loadAccounts:%d", @@ -247,26 +243,26 @@ void KExportDlg::loadAccounts(void) /* m_accountComboBox->setCurrentItem(0); - if(strList.contains(current) > 0) + if(strList.tqcontains(current) > 0) m_accountComboBox->setCurrentText(current); */ } -QString KExportDlg::accountId() const +TQString KExportDlg::accountId() const { return m_lastAccount; } /* -void KExportDlg::addCategories(QStringList& strList, const QString& id, const QString& leadIn) const +void KExportDlg::addCategories(TQStringList& strList, const TQString& id, const TQString& leadIn) const { MyMoneyFile *file = MyMoneyFile::instance(); - QString name; + TQString name; MyMoneyAccount account = file->account(id); - QStringList accList = account.accountList(); - QStringList::ConstIterator it_a; + TQStringList accList = account.accountList(); + TQStringList::ConstIterator it_a; for(it_a = accList.begin(); it_a != accList.end(); ++it_a) { account = file->account(*it_a); @@ -275,7 +271,7 @@ void KExportDlg::addCategories(QStringList& strList, const QString& id, const QS } } -QString KExportDlg::accountId(const QString& account) const +TQString KExportDlg::accountId(const TQString& account) const { return MyMoneyFile::instance()->nameToAccount(account); } diff --git a/kmymoney2/dialogs/kexportdlg.h b/kmymoney2/dialogs/kexportdlg.h index cad5091..9afca12 100644 --- a/kmymoney2/dialogs/kexportdlg.h +++ b/kmymoney2/dialogs/kexportdlg.h @@ -23,8 +23,8 @@ // ---------------------------------------------------------------------------- // QT Headers -#include <qstring.h> -#include <qcheckbox.h> +#include <tqstring.h> +#include <tqcheckbox.h> // ---------------------------------------------------------------------------- // KDE Headers @@ -39,9 +39,9 @@ /** * This class is used to select the required user input to export - * a specified account to the popular QIF format. - * It relies upon the QIF file handling routines in MyMoneyQifProfile and - * MyMoneyQifWriter to do the actual writing of QIF files. + * a specified account to the popular TQIF format. + * It relies upon the TQIF file handling routines in MyMoneyQifProfile and + * MyMoneyQifWriter to do the actual writing of TQIF files. * * It uses the global KConfig object to read and write the application * settings. @@ -50,47 +50,48 @@ * * @author Felix Rodriguez, Michael Edwardes, Thomas Baumgart 2000-2003 * - * @short A class to select user data required to export a specified account to the popular QIF format. + * @short A class to select user data required to export a specified account to the popular TQIF format. **/ class KExportDlg : public KExportDlgDecl { Q_OBJECT + TQ_OBJECT public: - KExportDlg(QWidget *parent); + KExportDlg(TQWidget *tqparent); ~KExportDlg(); /** * This method returns the filename entered into the edit field * - * @return QString with filename + * @return TQString with filename */ - const QString filename(void) const { return m_qlineeditFile->text(); }; + const TQString filename(void) const { return m_qlineeditFile->text(); }; /** * This method returns the account id that has been selected for export * - * @return QString with account id + * @return TQString with account id */ - QString accountId(void) const; + TQString accountId(void) const; /** * This method returns the name of the profile that has been selected * for the export operation * - * @return QString with profile name + * @return TQString with profile name */ - const QString profile(void) const { return m_profileComboBox->currentText(); }; + const TQString profile(void) const { return m_profileComboBox->currentText(); }; /** * This method returns the start date of the export dialog */ - const QDate startDate(void) const { return m_kmymoneydateStart->date(); }; + const TQDate startDate(void) const { return m_kmymoneydateStart->date(); }; /** * This method returns the end date of the export dialog */ - const QDate endDate(void) const { return m_kmymoneydateEnd->date(); }; + const TQDate endDate(void) const { return m_kmymoneydateEnd->date(); }; /** * This method returns the state of the account checkbox @@ -109,7 +110,7 @@ protected slots: void slotOkClicked(); /** - * Called when the user needs to browse the filesystem for a QIF file + * Called when the user needs to browse the filesystem for a TQIF file */ void slotBrowse(); @@ -130,7 +131,7 @@ protected slots: * * @param account The id of the selected account. */ - void checkData(const QString& account = QString()); + void checkData(const TQString& account = TQString()); private: void readConfig(void); @@ -162,7 +163,7 @@ private: * @param id Account id to add * @param leadIn constant leadin to be added in front of the account name */ - // void addCategories(QStringList& strList, const QString& id, const QString& leadIn) const; + // void addCategories(TQStringList& strList, const TQString& id, const TQString& leadIn) const; /** * This method is used to return the account id of a given account name @@ -171,10 +172,10 @@ private: * @return the ID of the account will be returned. * See MyMoneyFile::nameToAccount() for details. */ - // QString accountId(const QString& account) const; + // TQString accountId(const TQString& account) const; private: - QString m_lastAccount; + TQString m_lastAccount; }; #endif diff --git a/kmymoney2/dialogs/kexportdlgdecl.ui b/kmymoney2/dialogs/kexportdlgdecl.ui index 5425210..922355d 100644 --- a/kmymoney2/dialogs/kexportdlgdecl.ui +++ b/kmymoney2/dialogs/kexportdlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KExportDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KExportDlgDecl</cstring> </property> @@ -20,7 +20,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -34,7 +34,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -57,7 +57,7 @@ You can choose the file's path, the account and the format of the QIF file (profile). Choose Account to export all the transactions between the specified dates or just categories. You can also limit the transactions that are exported by start and ending date. Once you have pressed the Export button a message box will appear when the export has completed detailing how many transactions, categories and payees were exported.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -79,7 +79,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout45</cstring> </property> @@ -93,7 +93,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblFileExport</cstring> </property> @@ -109,7 +109,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <string>File to export to:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_qlineeditFile</cstring> </property> @@ -130,23 +130,23 @@ You can choose the file's path, the account and the format of the QIF file (prof </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -161,7 +161,7 @@ You can choose the file's path, the account and the format of the QIF file (prof </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout47</cstring> </property> @@ -175,7 +175,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -183,7 +183,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <string>QIF Profile</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout46</cstring> </property> @@ -209,7 +209,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -233,15 +233,15 @@ You can choose the file's path, the account and the format of the QIF file (prof </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_qgroupboxContents</cstring> </property> @@ -258,7 +258,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_qcheckboxAccount</cstring> </property> @@ -266,7 +266,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <string>Account</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_qcheckboxCategories</cstring> </property> @@ -276,7 +276,7 @@ You can choose the file's path, the account and the format of the QIF file (prof </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_qgroupboxDates</cstring> </property> @@ -293,9 +293,9 @@ You can choose the file's path, the account and the format of the QIF file (prof <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <grid> <property name="name"> @@ -306,7 +306,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <cstring>m_kmymoneydateStart</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblEndDate</cstring> </property> @@ -318,7 +318,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>50</width> <height>0</height> @@ -328,7 +328,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <string>End on:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblStartDate</cstring> </property> @@ -340,7 +340,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>50</width> <height>0</height> @@ -377,7 +377,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>230</width> <height>16</height> @@ -400,7 +400,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout49</cstring> </property> @@ -424,7 +424,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>451</width> <height>0</height> @@ -503,5 +503,5 @@ You can choose the file's path, the account and the format of the QIF file (prof <data format="XPM.GZ" length="3368">789c9595c94eeb581086f73c4544ed50ab6eecd889ad562f1802843961a6d58b632764228c616cf5bb77f9d45fe75e11165c4c703e55d55fc319f8b152bb38daafadfc587a9abbf9b8ac9523f7585be93fcf66ef7ffff3d7bf4bcb715c93df2891d7f21f4bcb5cd4cadac1ddedc003fd02ddf9af16274075ffe3b91738f33c01276aa722b0b753ec390b7c0cce107f092e238d7fa838aa578fe713b0c5bf1aabdddd8033e49f1923be052e11df31867dc77366fe1c81cdbeab1c5b3d4d30f2d351c571dd988fc196ffda731e43cf811b98a79b06d6fa5e8c11ff1458e775054ec0dd8a1b91f9731d9ca9dd0d9513d35ff79c9b9dc7c68ddcdbf7c125ecefca16cf7e9e4994987dcfb34b73d86363e41f559cc6691ff93f8c119f2a3723b5bb8931faffc91abf691cabfd0e9c42ffd21876bf9ea90bf946c6a9f37ca66cf16e0c463fb46a8cf95e0456bb3346be3ad8fa3d34463fcf153763b33b678cf853e516e6415bc688bf31567fde04a7e8cffcd13ffbf56f4afea6ef971265f157bdd218f9d7c0e8878fc0a88ffdfe6f355a51abe1b9ad9c59ff0781fd7e62afdf2a5a79abf0f63765f377857123f2f67bb0e5f3e7256bb4f24cf3ed83fbcad4530efe99e722373e5476981faf05d679ad1aa3fe0b63ad8737c0982fed19c33ea8384ff2284f3c1f283b9be746609dc79bb19e37877837403d3bca458cf3531a23de9fdfbc147fed673bb0d6f7688cfc5960cdd737c6bc87caa2affe8dc09aefc338d17e3be026f291b1fad318ecb0bf38b0f677628cf5f1f7ab4b4c8f7363d4731b58eb2763d43f02231f9f0656bd8631f44cdfe6d535c67afaf9b8d245aef43c05a7e04439c44f8d511f2b9736cf79609d0ff44b9bd719d8ea7b0763fdd89f8742ea6beabfed73e53206df05d6fbecd618e7f311dc84ff0bd82993df7f453fd81f02abdecc58f737a56087fbf3d518f14f81f5bed17afb7dac07b58dd19fbfcfcab418383d3f73e550df36d8fa7f0eacfa57ca03ccbb3b67928ffbc6435eaf10ef92fb3ce06b1e7ef18c78cc138d80bee329dff08c6ff98eeff9811ff989e7fcecdf2ffcca6ffcfed39f0bf93610ef0f5ee5355ee70d6ef3266fc9df6deec8b3c3bbbcf7497f5fb40ff8503c8eb8cb3d6fedf1b1d0099f4accd927fd219f7bef0bf1eaf1255f719d23ff3de606279c7ed26f4addeba25629b738e39c98881c891695d45fd4a7016fd075e54d431ad1980f684253bae11ecde896ee16f41fe95e6c0f9c55def4484f92ab4573afd1a6e785fa5f65264ebc72effd22b1aff446eff421d60b5a5dd09fd39af8af134b254fbe8f8836a84d958aa3ad85fab765de3dea48979b555db4237ebbb447fbf23ea0c3c5fa799b643ea2d595ba7ba2bd2b9e0f744c27dca0d32feaef5029fe056f499767744e173413cb842ee98aea5fe877a4d7a85a577aa148a6b94fb1ecb3091d5183924ffa234a659f9c4ae61b8e6cffd2896837a945d9c2fa8e650fcadea2bc72e3b69399b842a2afe41eebbb81bbfea43f7143d983a91b714a776e4cab74e89f3a6db9899bba9b4ffadf7c82fe6ff857e7f7f7f425e25b39baf3e5fffe5cfa1fdc4beba0</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kfindtransactiondlg.cpp b/kmymoney2/dialogs/kfindtransactiondlg.cpp index f122ba2..a1d5214 100644 --- a/kmymoney2/dialogs/kfindtransactiondlg.cpp +++ b/kmymoney2/dialogs/kfindtransactiondlg.cpp @@ -17,12 +17,12 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlabel.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qtimer.h> -#include <qtabwidget.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqtimer.h> +#include <tqtabwidget.h> +#include <tqlayout.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -56,15 +56,15 @@ #include "ksortoptiondlg.h" -KFindTransactionDlg::KFindTransactionDlg(QWidget *parent, const char *name) : - KFindTransactionDlgDecl(parent, name, false), +KFindTransactionDlg::KFindTransactionDlg(TQWidget *tqparent, const char *name) : + KFindTransactionDlgDecl(tqparent, name, false), m_needReload(false) { m_register->installEventFilter(this); m_tabWidget->setTabEnabled(m_resultPage, false); // 'cause we don't have a separate setupTextPage - connect(m_textEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateSelections())); + connect(m_textEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateSelections())); setupAccountsPage(); setupCategoriesPage(); @@ -74,16 +74,16 @@ KFindTransactionDlg::KFindTransactionDlg(QWidget *parent, const char *name) : setupDetailsPage(); // We don't need to add the default into the list (see ::slotShowHelp() why) - // m_helpAnchor[m_textTab] = QString("details.search"); - m_helpAnchor[m_accountTab] = QString("details.search.account"); - m_helpAnchor[m_dateTab] = QString("details.search.date"); - m_helpAnchor[m_amountTab] = QString("details.search.amount"); - m_helpAnchor[m_categoryTab] = QString("details.search.category"); - m_helpAnchor[m_payeeTab] = QString("details.search.payee"); - m_helpAnchor[m_detailsTab] = QString("details.search.details"); + // m_helpAnchor[m_textTab] = TQString("details.search"); + m_helpAnchor[m_accountTab] = TQString("details.search.account"); + m_helpAnchor[m_dateTab] = TQString("details.search.date"); + m_helpAnchor[m_amountTab] = TQString("details.search.amount"); + m_helpAnchor[m_categoryTab] = TQString("details.search.category"); + m_helpAnchor[m_payeeTab] = TQString("details.search.payee"); + m_helpAnchor[m_detailsTab] = TQString("details.search.details"); // setup the register - QValueList<KMyMoneyRegister::Column> cols; + TQValueList<KMyMoneyRegister::Column> cols; cols << KMyMoneyRegister::DateColumn; cols << KMyMoneyRegister::AccountColumn; cols << KMyMoneyRegister::DetailColumn; @@ -91,26 +91,26 @@ KFindTransactionDlg::KFindTransactionDlg(QWidget *parent, const char *name) : cols << KMyMoneyRegister::PaymentColumn; cols << KMyMoneyRegister::DepositColumn; m_register->setupRegister(MyMoneyAccount(), cols); - m_register->setSelectionMode(QTable::Single); + m_register->setSelectionMode(TQTable::Single); - connect(m_register, SIGNAL(editTransaction()), this, SLOT(slotSelectTransaction())); - connect(m_register, SIGNAL(headerClicked()), this, SLOT(slotSortOptions())); + connect(m_register, TQT_SIGNAL(editTransaction()), this, TQT_SLOT(slotSelectTransaction())); + connect(m_register, TQT_SIGNAL(headerClicked()), this, TQT_SLOT(slotSortOptions())); slotUpdateSelections(); // setup the connections - connect(m_searchButton, SIGNAL(clicked()), this, SLOT(slotSearch())); - connect(m_resetButton, SIGNAL(clicked()), this, SLOT(slotReset())); - connect(m_resetButton, SIGNAL(clicked()), m_accountsView, SLOT(slotSelectAllAccounts())); - connect(m_resetButton, SIGNAL(clicked()), m_categoriesView, SLOT(slotSelectAllAccounts())); - connect(m_closeButton, SIGNAL(clicked()), this, SLOT(deleteLater())); - connect(m_helpButton, SIGNAL(clicked()), this, SLOT(slotShowHelp())); + connect(m_searchButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearch())); + connect(m_resetButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReset())); + connect(m_resetButton, TQT_SIGNAL(clicked()), m_accountsView, TQT_SLOT(slotSelectAllAccounts())); + connect(m_resetButton, TQT_SIGNAL(clicked()), m_categoriesView, TQT_SLOT(slotSelectAllAccounts())); + connect(m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteLater())); + connect(m_helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowHelp())); // only allow searches when a selection has been made - connect(this, SIGNAL(selectionEmpty(bool)), m_searchButton, SLOT(setDisabled(bool))); + connect(this, TQT_SIGNAL(selectionEmpty(bool)), m_searchButton, TQT_SLOT(setDisabled(bool))); // get signal about engine changes - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotRefreshView())); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotRefreshView())); slotUpdateSelections(); @@ -119,7 +119,7 @@ KFindTransactionDlg::KFindTransactionDlg(QWidget *parent, const char *name) : void KFindTransactionDlg::slotReset(void) { - m_textEdit->setText(QString()); + m_textEdit->setText(TQString()); m_regExp->setChecked(false); m_caseSensitive->setChecked(false); m_textNegate->setCurrentItem(0); @@ -127,9 +127,9 @@ void KFindTransactionDlg::slotReset(void) m_amountEdit->setEnabled(true); m_amountFromEdit->setEnabled(false); m_amountToEdit->setEnabled(false); - m_amountEdit->loadText(QString()); - m_amountFromEdit->loadText(QString()); - m_amountToEdit->loadText(QString()); + m_amountEdit->loadText(TQString()); + m_amountFromEdit->loadText(TQString()); + m_amountToEdit->loadText(TQString()); m_amountButton->setChecked(true); m_amountRangeButton->setChecked(false); @@ -143,9 +143,9 @@ void KFindTransactionDlg::slotReset(void) m_nrEdit->setEnabled(true); m_nrFromEdit->setEnabled(false); m_nrToEdit->setEnabled(false); - m_nrEdit->setText(QString()); - m_nrFromEdit->setText(QString()); - m_nrToEdit->setText(QString()); + m_nrEdit->setText(TQString()); + m_nrFromEdit->setText(TQString()); + m_nrToEdit->setText(TQString()); m_nrButton->setChecked(true); m_nrRangeButton->setChecked(false); @@ -160,14 +160,14 @@ void KFindTransactionDlg::slotReset(void) void KFindTransactionDlg::slotUpdateSelections(void) { - QString txt; + TQString txt; // Text tab if(!m_textEdit->text().isEmpty()) { if(!txt.isEmpty()) txt += ", "; txt += i18n("Text"); - m_regExp->setEnabled(QRegExp(m_textEdit->text()).isValid()); + m_regExp->setEnabled(TQRegExp(m_textEdit->text()).isValid()); } else m_regExp->setEnabled(false); @@ -241,13 +241,13 @@ void KFindTransactionDlg::slotUpdateSelections(void) m_selectedCriteria->setText(i18n("Current selections: ") + txt); } -bool KFindTransactionDlg::allItemsSelected(const QListViewItem *item) const +bool KFindTransactionDlg::allItemsSelected(const TQListViewItem *item) const { - QListViewItem* it_v; + TQListViewItem* it_v; for(it_v = item->firstChild(); it_v != 0; it_v = it_v->nextSibling()) { if(it_v->rtti() == 1) { - QCheckListItem* it_c = static_cast<QCheckListItem*>(it_v); + TQCheckListItem* it_c = static_cast<TQCheckListItem*>(it_v); if(!(it_c->isOn() && allItemsSelected(it_v))) return false; } @@ -255,14 +255,14 @@ bool KFindTransactionDlg::allItemsSelected(const QListViewItem *item) const return true; } -bool KFindTransactionDlg::allItemsSelected(const QListView* view) const +bool KFindTransactionDlg::allItemsSelected(const TQListView* view) const { - QListViewItem* it_v; + TQListViewItem* it_v; for(it_v = view->firstChild(); it_v != 0; it_v = it_v->nextSibling()) { if(it_v->rtti() == 1) { - QCheckListItem* it_c = static_cast<QCheckListItem*>(it_v); - if(it_c->type() == QCheckListItem::CheckBox) { + TQCheckListItem* it_c = static_cast<TQCheckListItem*>(it_v); + if(it_c->type() == TQCheckListItem::CheckBox) { if(!(it_c->isOn() && allItemsSelected(it_v))) return false; } else { @@ -276,23 +276,23 @@ bool KFindTransactionDlg::allItemsSelected(const QListView* view) const void KFindTransactionDlg::setupAccountsPage(void) { - m_accountsView->setSelectionMode(QListView::Multi); + m_accountsView->setSelectionMode(TQListView::Multi); AccountSet accountSet; accountSet.addAccountGroup(MyMoneyAccount::Asset); accountSet.addAccountGroup(MyMoneyAccount::Liability); //set the accountset to show closed account if the settings say so accountSet.setHideClosedAccounts(KMyMoneyGlobalSettings::hideClosedAccounts()); accountSet.load(m_accountsView); - connect(m_accountsView, SIGNAL(stateChanged()), this, SLOT(slotUpdateSelections())); + connect(m_accountsView, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(slotUpdateSelections())); } -void KFindTransactionDlg::selectAllItems(QListView* view, const bool state) +void KFindTransactionDlg::selectAllItems(TQListView* view, const bool state) { - QListViewItem* it_v; + TQListViewItem* it_v; for(it_v = view->firstChild(); it_v != 0; it_v = it_v->nextSibling()) { - QCheckListItem* it_c = static_cast<QCheckListItem*>(it_v); - if(it_c->type() == QCheckListItem::CheckBox) { + TQCheckListItem* it_c = static_cast<TQCheckListItem*>(it_v); + if(it_c->type() == TQCheckListItem::CheckBox) { it_c->setOn(state); } selectAllSubItems(it_v, state); @@ -301,13 +301,13 @@ void KFindTransactionDlg::selectAllItems(QListView* view, const bool state) slotUpdateSelections(); } -void KFindTransactionDlg::selectItems(QListView* view, const QStringList& list, const bool state) +void KFindTransactionDlg::selectItems(TQListView* view, const TQStringList& list, const bool state) { - QListViewItem* it_v; + TQListViewItem* it_v; for(it_v = view->firstChild(); it_v != 0; it_v = it_v->nextSibling()) { KMyMoneyCheckListItem* it_c = static_cast<KMyMoneyCheckListItem*>(it_v); - if(it_c->type() == QCheckListItem::CheckBox && list.contains(it_c->id())) { + if(it_c->type() == TQCheckListItem::CheckBox && list.tqcontains(it_c->id())) { it_c->setOn(state); } selectSubItems(it_v, list, state); @@ -318,31 +318,31 @@ void KFindTransactionDlg::selectItems(QListView* view, const QStringList& list, void KFindTransactionDlg::setupCategoriesPage(void) { - m_categoriesView->setSelectionMode(QListView::Multi); + m_categoriesView->setSelectionMode(TQListView::Multi); AccountSet categorySet; categorySet.addAccountGroup(MyMoneyAccount::Income); categorySet.addAccountGroup(MyMoneyAccount::Expense); categorySet.load(m_categoriesView); - connect(m_categoriesView, SIGNAL(stateChanged()), this, SLOT(slotUpdateSelections())); + connect(m_categoriesView, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(slotUpdateSelections())); } -void KFindTransactionDlg::selectAllSubItems(QListViewItem* item, const bool state) +void KFindTransactionDlg::selectAllSubItems(TQListViewItem* item, const bool state) { - QListViewItem* it_v; + TQListViewItem* it_v; for(it_v = item->firstChild(); it_v != 0; it_v = it_v->nextSibling()) { - static_cast<QCheckListItem*>(it_v)->setOn(state); + static_cast<TQCheckListItem*>(it_v)->setOn(state); selectAllSubItems(it_v, state); } } -void KFindTransactionDlg::selectSubItems(QListViewItem* item, const QStringList& list, const bool state) +void KFindTransactionDlg::selectSubItems(TQListViewItem* item, const TQStringList& list, const bool state) { - QListViewItem* it_v; + TQListViewItem* it_v; for(it_v = item->firstChild(); it_v != 0; it_v = it_v->nextSibling()) { KMyMoneyCheckListItem* it_c = static_cast<KMyMoneyCheckListItem*>(it_v); - if(list.contains(it_c->id())) + if(list.tqcontains(it_c->id())) it_c->setOn(state); selectSubItems(it_v, list, state); } @@ -355,9 +355,9 @@ void KFindTransactionDlg::setupDatePage(void) MyMoneyTransactionFilter::translateDateRange(static_cast<MyMoneyTransactionFilter::dateOptionE>(i), m_startDates[i], m_endDates[i]); } - connect(m_dateRange, SIGNAL(itemSelected(int)), this, SLOT(slotDateRangeChanged(int))); - connect(m_fromDate, SIGNAL(dateChanged(const QDate&)), this, SLOT(slotDateChanged())); - connect(m_toDate, SIGNAL(dateChanged(const QDate&)), this, SLOT(slotDateChanged())); + connect(m_dateRange, TQT_SIGNAL(itemSelected(int)), this, TQT_SLOT(slotDateRangeChanged(int))); + connect(m_fromDate, TQT_SIGNAL(dateChanged(const TQDate&)), this, TQT_SLOT(slotDateChanged())); + connect(m_toDate, TQT_SIGNAL(dateChanged(const TQDate&)), this, TQT_SLOT(slotDateChanged())); slotDateRangeChanged(MyMoneyTransactionFilter::allDates); } @@ -367,8 +367,8 @@ void KFindTransactionDlg::slotDateRangeChanged(int idx) switch(idx) { case MyMoneyTransactionFilter::allDates: case MyMoneyTransactionFilter::userDefined: - m_fromDate->loadDate(QDate()); - m_toDate->loadDate(QDate()); + m_fromDate->loadDate(TQDate()); + m_toDate->loadDate(TQDate()); break; default: m_fromDate->loadDate(m_startDates[idx]); @@ -399,12 +399,12 @@ void KFindTransactionDlg::slotDateChanged(void) void KFindTransactionDlg::setupAmountPage(void) { - connect(m_amountButton, SIGNAL(clicked()), this, SLOT(slotAmountSelected())); - connect(m_amountRangeButton, SIGNAL(clicked()), this, SLOT(slotAmountRangeSelected())); + connect(m_amountButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAmountSelected())); + connect(m_amountRangeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAmountRangeSelected())); - connect(m_amountEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateSelections())); - connect(m_amountFromEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateSelections())); - connect(m_amountToEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateSelections())); + connect(m_amountEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateSelections())); + connect(m_amountFromEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateSelections())); + connect(m_amountToEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateSelections())); m_amountButton->setChecked(true); slotAmountSelected(); @@ -428,28 +428,28 @@ void KFindTransactionDlg::slotAmountRangeSelected(void) void KFindTransactionDlg::setupPayeesPage(void) { - m_payeesView->setSelectionMode(QListView::Single); + m_payeesView->setSelectionMode(TQListView::Single); m_payeesView->header()->hide(); loadPayees(); m_emptyPayeesButton->setChecked(false); - connect(m_allPayeesButton, SIGNAL(clicked()), this, SLOT(slotSelectAllPayees())); - connect(m_clearPayeesButton, SIGNAL(clicked()), this, SLOT(slotDeselectAllPayees())); - connect(m_emptyPayeesButton, SIGNAL(stateChanged(int)), this, SLOT(slotUpdateSelections())); + connect(m_allPayeesButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectAllPayees())); + connect(m_clearPayeesButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeselectAllPayees())); + connect(m_emptyPayeesButton, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotUpdateSelections())); } void KFindTransactionDlg::loadPayees(void) { MyMoneyFile* file = MyMoneyFile::instance(); - QValueList<MyMoneyPayee> list; - QValueList<MyMoneyPayee>::Iterator it_l; + TQValueList<MyMoneyPayee> list; + TQValueList<MyMoneyPayee>::Iterator it_l; list = file->payeeList(); // load view for(it_l = list.begin(); it_l != list.end(); ++it_l) { - KMyMoneyCheckListItem* item = new KMyMoneyCheckListItem(m_payeesView, (*it_l).name(), QString(), (*it_l).id()); - connect(item, SIGNAL(stateChanged(bool)), this, SLOT(slotUpdateSelections())); + KMyMoneyCheckListItem* item = new KMyMoneyCheckListItem(m_payeesView, (*it_l).name(), TQString(), (*it_l).id()); + connect(item, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(slotUpdateSelections())); item->setOn(true); } } @@ -465,15 +465,15 @@ void KFindTransactionDlg::slotDeselectAllPayees(void) void KFindTransactionDlg::setupDetailsPage(void) { - connect(m_typeBox, SIGNAL(activated(int)), this, SLOT(slotUpdateSelections())); - connect(m_stateBox, SIGNAL(activated(int)), this, SLOT(slotUpdateSelections())); - connect(m_validityBox, SIGNAL(activated(int)), this, SLOT(slotUpdateSelections())); + connect(m_typeBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateSelections())); + connect(m_stateBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateSelections())); + connect(m_validityBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateSelections())); - connect(m_nrButton, SIGNAL(clicked()), this, SLOT(slotNrSelected())); - connect(m_nrRangeButton, SIGNAL(clicked()), this, SLOT(slotNrRangeSelected())); - connect(m_nrEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateSelections())); - connect(m_nrFromEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateSelections())); - connect(m_nrToEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateSelections())); + connect(m_nrButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNrSelected())); + connect(m_nrRangeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNrRangeSelected())); + connect(m_nrEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateSelections())); + connect(m_nrFromEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateSelections())); + connect(m_nrToEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateSelections())); m_nrButton->setChecked(true); slotNrSelected(); @@ -495,7 +495,7 @@ void KFindTransactionDlg::slotNrRangeSelected(void) slotUpdateSelections(); } -void KFindTransactionDlg::addItemToFilter(const opTypeE op, const QString& id) +void KFindTransactionDlg::addItemToFilter(const opTypeE op, const TQString& id) { switch(op) { case addAccountToFilter: @@ -510,14 +510,14 @@ void KFindTransactionDlg::addItemToFilter(const opTypeE op, const QString& id) } } -void KFindTransactionDlg::scanCheckListItems(const QListViewItem* item, const opTypeE op) +void KFindTransactionDlg::scanCheckListItems(const TQListViewItem* item, const opTypeE op) { - QListViewItem* it_v; + TQListViewItem* it_v; for(it_v = item->firstChild(); it_v != 0; it_v = it_v->nextSibling()) { if(it_v->rtti() == 1) { KMyMoneyCheckListItem* it_c = static_cast<KMyMoneyCheckListItem*>(it_v); - if(it_c->type() == QCheckListItem::CheckBox) { + if(it_c->type() == TQCheckListItem::CheckBox) { if(it_c->isOn()) addItemToFilter(op, (*it_c).id()); } @@ -526,14 +526,14 @@ void KFindTransactionDlg::scanCheckListItems(const QListViewItem* item, const op } } -void KFindTransactionDlg::scanCheckListItems(const QListView* view, const opTypeE op) +void KFindTransactionDlg::scanCheckListItems(const TQListView* view, const opTypeE op) { - QListViewItem* it_v; + TQListViewItem* it_v; for(it_v = view->firstChild(); it_v != 0; it_v = it_v->nextSibling()) { if(it_v->rtti() == 1) { KMyMoneyCheckListItem* it_c = static_cast<KMyMoneyCheckListItem*>(it_v); - if(it_c->type() == QCheckListItem::CheckBox) { + if(it_c->type() == TQCheckListItem::CheckBox) { if(it_c->isOn()) addItemToFilter(op, (*it_c).id()); } @@ -548,27 +548,27 @@ void KFindTransactionDlg::setupFilter(void) // Text tab if(!m_textEdit->text().isEmpty()) { - QRegExp exp(m_textEdit->text(), m_caseSensitive->isChecked(), !m_regExp->isChecked()); + TQRegExp exp(m_textEdit->text(), m_caseSensitive->isChecked(), !m_regExp->isChecked()); m_filter.setTextFilter(exp, m_textNegate->currentItem() != 0); } // Account tab if(!m_accountsView->allItemsSelected()) { // retrieve a list of selected accounts - QStringList list; + TQStringList list; m_accountsView->selectedItems(list); // if we're not in expert mode, we need to make sure // that all stock accounts for the selected investment // account are also selected if(!KMyMoneyGlobalSettings::expertMode()) { - QStringList missing; - QStringList::const_iterator it_a, it_b; + TQStringList missing; + TQStringList::const_iterator it_a, it_b; for(it_a = list.begin(); it_a != list.end(); ++it_a) { MyMoneyAccount acc = MyMoneyFile::instance()->account(*it_a); if(acc.accountType() == MyMoneyAccount::Investment) { for(it_b = acc.accountList().begin(); it_b != acc.accountList().end(); ++it_b) { - if(!list.contains(*it_b)) { + if(!list.tqcontains(*it_b)) { missing.append(*it_b); } } @@ -608,7 +608,7 @@ void KFindTransactionDlg::setupFilter(void) // Payees tab if(m_emptyPayeesButton->isChecked()) { - m_filter.addPayee(QString()); + m_filter.addPayee(TQString()); } else if(!allItemsSelected(m_payeesView)) { scanCheckListItems(m_payeesView, addPayeeToFilter); @@ -674,8 +674,8 @@ void KFindTransactionDlg::loadView(void) MyMoneyFile::instance()->transactionList(m_transactionList, m_filter); // create the elements for the register - QValueList<QPair<MyMoneyTransaction, MyMoneySplit> >::const_iterator it; - QMap<QString, int>uniqueMap; + TQValueList<TQPair<MyMoneyTransaction, MyMoneySplit> >::const_iterator it; + TQMap<TQString, int>uniqueMap; MyMoneyMoney deposit, payment; int splitCount = 0; @@ -714,15 +714,15 @@ void KFindTransactionDlg::loadView(void) #if KMM_DEBUG m_foundText->setText(i18n("Found %1 matching transactions (D %2 / P %3 = %4)") - .arg(splitCount).arg(deposit.formatMoney("", 2)).arg(payment.formatMoney("", 2)).arg((deposit-payment).formatMoney("", 2))); + .tqarg(splitCount).tqarg(deposit.formatMoney("", 2)).tqarg(payment.formatMoney("", 2)).tqarg((deposit-payment).formatMoney("", 2))); #else - m_foundText->setText(i18n("Found %1 matching transactions") .arg(splitCount)); + m_foundText->setText(i18n("Found %1 matching transactions") .tqarg(splitCount)); #endif m_tabWidget->setTabEnabled(m_resultPage, true); m_tabWidget->setCurrentPage(m_tabWidget->indexOf(m_resultPage)); - QTimer::singleShot(10, this, SLOT(slotRightSize())); + TQTimer::singleShot(10, this, TQT_SLOT(slotRightSize())); } void KFindTransactionDlg::slotRightSize(void) @@ -730,7 +730,7 @@ void KFindTransactionDlg::slotRightSize(void) m_register->updateContents(); } -void KFindTransactionDlg::resizeEvent(QResizeEvent* ev) +void KFindTransactionDlg::resizeEvent(TQResizeEvent* ev) { // Columns // 1 = Date @@ -775,7 +775,7 @@ void KFindTransactionDlg::resizeEvent(QResizeEvent* ev) void KFindTransactionDlg::slotSelectTransaction(void) { - QValueList<KMyMoneyRegister::RegisterItem*> list = m_register->selectedItems(); + TQValueList<KMyMoneyRegister::RegisterItem*> list = m_register->selectedItems(); if(!list.isEmpty()) { KMyMoneyRegister::Transaction* t = dynamic_cast<KMyMoneyRegister::Transaction*>(list[0]); if(t) { @@ -785,21 +785,21 @@ void KFindTransactionDlg::slotSelectTransaction(void) } } -bool KFindTransactionDlg::eventFilter(QObject* o, QEvent* e) +bool KFindTransactionDlg::eventFilter(TQObject* o, TQEvent* e) { bool rc = false; if(o->isWidgetType()) { - if(e->type() == QEvent::KeyPress) { - const QWidget* w = dynamic_cast<const QWidget*>(o); - QKeyEvent *k = static_cast<QKeyEvent *> (e); + if(e->type() == TQEvent::KeyPress) { + const TQWidget* w = dynamic_cast<const TQWidget*>(o); + TQKeyEvent *k = TQT_TQKEYEVENT (e); if(w == m_register) { switch(k->key()) { default: break; - case Qt::Key_Return: - case Qt::Key_Enter: + case TQt::Key_Return: + case TQt::Key_Enter: rc = true; slotSelectTransaction(); break; @@ -812,9 +812,9 @@ bool KFindTransactionDlg::eventFilter(QObject* o, QEvent* e) void KFindTransactionDlg::slotShowHelp(void) { - QString anchor = m_helpAnchor[m_criteriaTab->currentPage()]; + TQString anchor = m_helpAnchor[m_criteriaTab->currentPage()]; if(anchor.isEmpty()) - anchor = QString("details.search"); + anchor = TQString("details.search"); kapp->invokeHelp(anchor); } @@ -823,11 +823,11 @@ void KFindTransactionDlg::slotSortOptions(void) { KSortOptionDlg* dlg = new KSortOptionDlg(this); - dlg->setSortOption(KMyMoneyGlobalSettings::sortSearchView(), QString()); + dlg->setSortOption(KMyMoneyGlobalSettings::sortSearchView(), TQString()); dlg->hideDefaultButton(); - if(dlg->exec() == QDialog::Accepted) { - QString sortOrder = dlg->sortOption(); + if(dlg->exec() == TQDialog::Accepted) { + TQString sortOrder = dlg->sortOption(); if(sortOrder != KMyMoneyGlobalSettings::sortSearchView()) { KMyMoneyGlobalSettings::setSortSearchView(sortOrder); slotRefreshView(); diff --git a/kmymoney2/dialogs/kfindtransactiondlg.h b/kmymoney2/dialogs/kfindtransactiondlg.h index edf9504..bd0cb7a 100644 --- a/kmymoney2/dialogs/kfindtransactiondlg.h +++ b/kmymoney2/dialogs/kfindtransactiondlg.h @@ -20,9 +20,9 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlistview.h> -#include <qdatetime.h> -#include <qmap.h> +#include <tqlistview.h> +#include <tqdatetime.h> +#include <tqmap.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -36,8 +36,8 @@ #include "../dialogs/kfindtransactiondlgdecl.h" -class QListView; -class QListViewItem; +class TQListView; +class TQListViewItem; /** * @author Thomas Baumgart @@ -45,6 +45,7 @@ class QListViewItem; class KFindTransactionDlg : public KFindTransactionDlgDecl { Q_OBJECT + TQ_OBJECT public: /* @@ -77,16 +78,16 @@ public: dateOptionCount }; */ - KFindTransactionDlg(QWidget *parent=0, const char *name=0); + KFindTransactionDlg(TQWidget *tqparent=0, const char *name=0); ~KFindTransactionDlg() {} - virtual bool eventFilter( QObject *o, QEvent *e ); + virtual bool eventFilter( TQObject *o, TQEvent *e ); public slots: void show(void); protected: - void resizeEvent(QResizeEvent*); + void resizeEvent(TQResizeEvent*); protected slots: virtual void slotReset(void); @@ -117,7 +118,7 @@ protected slots: /** * This slot selects the current selected transaction/split and emits - * the signal @a transactionSelected(const QString& accountId, const QString& transactionId) + * the signal @a transactionSelected(const TQString& accountId, const TQString& transactionId) */ void slotSelectTransaction(void); @@ -126,7 +127,7 @@ protected slots: void slotSortOptions(void); signals: - void transactionSelected(const QString& accountId, const QString& transactionId); + void transactionSelected(const TQString& accountId, const TQString& transactionId); /** * This signal is sent out when no selection has been made. It is @@ -150,10 +151,10 @@ protected: void setupFilter(void); - void selectAllItems(QListView* view, const bool state); - void selectAllSubItems(QListViewItem* item, const bool state); - void selectItems(QListView* view, const QStringList& list, const bool state); - void selectSubItems(QListViewItem* item, const QStringList& list, const bool state); + void selectAllItems(TQListView* view, const bool state); + void selectAllSubItems(TQListViewItem* item, const bool state); + void selectItems(TQListView* view, const TQStringList& list, const bool state); + void selectSubItems(TQListViewItem* item, const TQStringList& list, const bool state); /** * This method loads the m_payeesView with the payees name @@ -177,25 +178,25 @@ protected: * * @note If the view contains no items the method returns @p true. */ - bool allItemsSelected(const QListView* view) const; - bool allItemsSelected(const QListViewItem *item) const; + bool allItemsSelected(const TQListView* view) const; + bool allItemsSelected(const TQListViewItem *item) const; - void scanCheckListItems(const QListView* view, const opTypeE op); - void scanCheckListItems(const QListViewItem* item, const opTypeE op); - void addItemToFilter(const opTypeE op, const QString& id); + void scanCheckListItems(const TQListView* view, const opTypeE op); + void scanCheckListItems(const TQListViewItem* item, const opTypeE op); + void addItemToFilter(const opTypeE op, const TQString& id); protected: - QDate m_startDates[MyMoneyTransactionFilter::dateOptionCount]; - QDate m_endDates[MyMoneyTransactionFilter::dateOptionCount]; + TQDate m_startDates[MyMoneyTransactionFilter::dateOptionCount]; + TQDate m_endDates[MyMoneyTransactionFilter::dateOptionCount]; /** * This member holds a list of all transactions matching the filter criteria */ - QValueList<QPair<MyMoneyTransaction, MyMoneySplit> > m_transactionList; + TQValueList<TQPair<MyMoneyTransaction, MyMoneySplit> > m_transactionList; MyMoneyTransactionFilter m_filter; - QMap<QWidget*, QString> m_helpAnchor; + TQMap<TQWidget*, TQString> m_helpAnchor; bool m_needReload; }; diff --git a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui index 3340afd..8887776 100644 --- a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui +++ b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KFindTransactionDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KFindTransactionDlgDecl</cstring> </property> @@ -28,11 +28,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>m_tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_criteriaPage</cstring> </property> @@ -43,7 +43,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -51,7 +51,7 @@ <string>Define your search criteria</string> </property> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>m_criteriaTab</cstring> </property> @@ -63,7 +63,7 @@ <verstretch>3</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_textTab</cstring> </property> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>83</height> @@ -103,7 +103,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>0</height> @@ -125,7 +125,7 @@ <cstring>m_textNegate</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_regExp</cstring> </property> @@ -133,7 +133,7 @@ <string>Treat text as regular expression</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_caseSensitive</cstring> </property> @@ -143,7 +143,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_accountTab</cstring> </property> @@ -167,7 +167,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_dateTab</cstring> </property> @@ -178,17 +178,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <grid> <property name="name"> @@ -199,7 +199,7 @@ <cstring>m_dateRange</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -212,7 +212,7 @@ <cstring>m_fromDate</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -221,7 +221,7 @@ <comment>To (Date)</comment> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -247,7 +247,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -266,7 +266,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -275,7 +275,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_amountTab</cstring> </property> @@ -286,15 +286,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout22</cstring> + <cstring>tqlayout22</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -314,7 +314,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_amountButton</cstring> </property> @@ -322,7 +322,7 @@ <string>Search this amount</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_amountRangeButton</cstring> </property> @@ -332,9 +332,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <grid> <property name="name"> @@ -344,14 +344,14 @@ <property name="name"> <cstring>m_amountToEdit</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> </size> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel9</cstring> </property> @@ -359,7 +359,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel8</cstring> </property> @@ -372,14 +372,14 @@ <property name="name"> <cstring>m_amountEdit</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> </size> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -392,7 +392,7 @@ <property name="name"> <cstring>m_amountFromEdit</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -411,7 +411,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> @@ -430,7 +430,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>75</height> @@ -439,7 +439,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_categoryTab</cstring> </property> @@ -457,7 +457,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_payeeTab</cstring> </property> @@ -474,7 +474,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout46</cstring> </property> @@ -504,7 +504,7 @@ <cstring>m_payeesView</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_emptyPayeesButton</cstring> </property> @@ -514,7 +514,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout45</cstring> </property> @@ -554,7 +554,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>42</height> @@ -565,7 +565,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_detailsTab</cstring> </property> @@ -576,23 +576,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel11_2</cstring> </property> @@ -600,7 +600,7 @@ <string>Validity</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel10</cstring> </property> @@ -678,7 +678,7 @@ <cstring>m_validityBox</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel11</cstring> </property> @@ -698,7 +698,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>130</width> <height>20</height> @@ -707,15 +707,15 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout21</cstring> + <cstring>tqlayout21</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup2</cstring> </property> @@ -729,7 +729,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_nrButton</cstring> </property> @@ -737,7 +737,7 @@ <string>Search this number</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_nrRangeButton</cstring> </property> @@ -755,15 +755,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel12</cstring> </property> @@ -771,7 +771,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel14</cstring> </property> @@ -790,7 +790,7 @@ <cstring>m_nrEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel13</cstring> </property> @@ -816,7 +816,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -835,7 +835,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> @@ -845,18 +845,18 @@ </vbox> </widget> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_selectedCriteria</cstring> </property> <property name="text"> <string>text</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_transferWarning</cstring> </property> @@ -886,7 +886,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>24</height> @@ -895,7 +895,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_resultPage</cstring> </property> @@ -962,23 +962,23 @@ <number>12</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_foundText</cstring> </property> <property name="text"> <string>F</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> </vbox> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout25</cstring> + <cstring>tqlayout25</cstring> </property> <hbox> <property name="name"> @@ -1008,7 +1008,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -1097,5 +1097,10 @@ <data format="PNG" length="1110">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000041d49444154388d8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d09a6c508138cb8c13d647141163de49043bca9f1628eb9294810f24f88c15b728b07617358888785d980427290b4a8d00b19a8821da8228cf42316ac87eed9247ac95c9aeaeef9eaabdffb5ebf85f178ccfcf7f5b79fec07a7280a08a008f25ceb7c29e5da573716e65a0be3f198ef6f5ededff9b9e1b34faf90882092a1ea21428b9220ffbf46054055b19386ba6970ae6665b5e0d2c5eb0b066067bbe1f21757c88f5504eff0c192189081303a5582b16854fccce2fe041f00cdd0a8103b874556405476b62d972ec2c2b90ff3fd8df5cb946549d80b34aea15ccaa94625450e2d0e558b460b7371a734b5e027251a155545678ab62d7eea90b4c504078908c107acb354cb251b1f8f08b1c18631aabbb4d18211404804f22545863561d2f060fb34aa8a18d0086204e72c46a32292e1a796f278c1da7a859d8da9a737506db04d0a24103d8949480b214d3bbee952a05c1d536f9d2684160c744f048311543d459eb1b65ee1754cedae13a64abd5d6127053c9d0281f22d4f75c6a2118a5c09272d7ab740638bf4ef2dd2174032d0d8d04c6fe19c32bedd8bc65e342aa3f785e2784bfd6bc1bd9db24b05505616a4edd67d5a8c1801a03a9962754c504bf34b8986acfb9be91cac7d54315a15541b36b134f74bd2dc53940115a5381e087bc25c6f71be831a8baa234cc1ee3eeb74ed83116beb2b8849d108a3730e8ce27e2bfb82419a7b407ac7c222fd0e6280a8078ce64e47ef54ac9d5be9aaae0162e0de568a44a18d3df90845d919c4f01463406340a44f40efb43a99b371618488e2670d1a2d7ee6f1d3be39342104e937ed85fb86599c33e9ee0be9a004946259d8b858909880d59aa00daa0d3280b5f39e34074c4b3a5434029a76a9e9f5cc0163b5c80024158a1cfc4cb1d3061d5834066cb0a403c008599a70f6bc27b8d03106ea3ae91987278c5b143b015547224ab5e24185cd9b81665273e7b6e7cecd82ddbf8098002de94049737bc09828cf3036f31c3735c8b0e98eb704672f348c7f7c93cd1fb2ae905119ff54e0dff3542b0e9dd983dcea2cc5eea6cf303e74ec687af5c41b6fa38f5e203c7ec8e1238ef85831a214afef21060ea781ec68247b65c6916353cc8b73d1ae79354606af2a930709aa118da1636c274dd7e3774b884a79aa6b5711a538d33cf9c01c1c9b83bc6a1f55c91ccb23b05b1deb43a7decdaffefd2862f61366aa8449c69e33642f012f2bb208fa98eeda1f3346f076c8eeef19475e9be115423364f78f84105a8643d34d90cfbfdcd8cf872589a45dc7f54cf3134a36f4e495c23f9da8db15bccb708d4014f2ca512cb5d4f7c13e84300d5cff6eb39b202bab053bdb9674f0648609427d0f8402ddeac30f4fcd3ced3efc3b422d406c09b340bedc1571e1bfc3d44dc281634c5fe5e758e7395cfbe6d6c130fd17d92372d277c159b70000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kgncimportoptionsdlg.cpp b/kmymoney2/dialogs/kgncimportoptionsdlg.cpp index e11ff69..9aaf5b6 100644 --- a/kmymoney2/dialogs/kgncimportoptionsdlg.cpp +++ b/kmymoney2/dialogs/kgncimportoptionsdlg.cpp @@ -17,11 +17,11 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qlayout.h> -#include <qapplication.h> -#include <qcombobox.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqlayout.h> +#include <tqapplication.h> +#include <tqcombobox.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -35,8 +35,8 @@ #include "kgncimportoptionsdlg.h" // dialog constructor -KGncImportOptionsDlg::KGncImportOptionsDlg(QWidget *parent, const char *name) - : KGncImportOptionsDlgDecl(parent, name) +KGncImportOptionsDlg::KGncImportOptionsDlg(TQWidget *tqparent, const char *name) + : KGncImportOptionsDlgDecl(tqparent, name) { buttonInvestGroup->setRadioButtonExclusive (true); buttonInvestGroup->setButton (0); @@ -50,7 +50,7 @@ KGncImportOptionsDlg::KGncImportOptionsDlg(QWidget *parent, const char *name) checkDebugXML->setChecked (false); checkAnonymize->setChecked (false); - connect (checkDecode, SIGNAL(toggled(bool)), this, SLOT(slotDecodeOptionChanged(bool))); + connect (checkDecode, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotDecodeOptionChanged(bool))); } KGncImportOptionsDlg::~KGncImportOptionsDlg() @@ -71,12 +71,12 @@ void KGncImportOptionsDlg::slotDecodeOptionChanged(bool isOn) { // try to get the others in some sort of order of likelihood void KGncImportOptionsDlg::buildCodecList () { - m_localeCodec = QTextCodec::codecForLocale(); + m_localeCodec = TQTextCodec::codecForLocale(); m_codecList.setAutoDelete (true); // retrieve all codec pointers - QTextCodec *codec; + TQTextCodec *codec; unsigned int i; - for (i = 0; (codec = QTextCodec::codecForIndex(i)); i++) { + for (i = 0; (codec = TQTextCodec::codecForIndex(i)); i++) { int rank; if (codec == m_localeCodec) rank = 999; // ensure locale rank comes first else rank = codec->heuristicNameMatch(m_localeCodec->name()); @@ -86,7 +86,7 @@ void KGncImportOptionsDlg::buildCodecList () { } m_codecList.sort(); for (i = 0; i < m_codecList.count(); i++) { - QString name (m_codecList.at(i)->second->name()); + TQString name (m_codecList.at(i)->second->name()); comboDecode->insertItem (name); } } @@ -102,8 +102,8 @@ int codecDataList::compareItems (void *a, void *b) { return (1); } // ranks are equal, sort on name, case insensitive - QString sa(pa->second->name()); - QString sb(pb->second->name()); + TQString sa(pa->second->name()); + TQString sb(pb->second->name()); if (sa.lower() > sb.lower()) { return (1); } else { @@ -112,7 +112,7 @@ int codecDataList::compareItems (void *a, void *b) { } // return selected codec or 0 -QTextCodec* KGncImportOptionsDlg::decodeOption(void) { +TQTextCodec* KGncImportOptionsDlg::decodeOption(void) { if (!checkDecode->isChecked()) { return (0); } else { diff --git a/kmymoney2/dialogs/kgncimportoptionsdlg.h b/kmymoney2/dialogs/kgncimportoptionsdlg.h index 5ab6202..787bd8b 100644 --- a/kmymoney2/dialogs/kgncimportoptionsdlg.h +++ b/kmymoney2/dialogs/kgncimportoptionsdlg.h @@ -20,10 +20,10 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qtextcodec.h> -#include <qptrlist.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqtextcodec.h> +#include <tqptrlist.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -32,24 +32,25 @@ // Project Includes #include "../dialogs/kgncimportoptionsdlgdecl.h" -typedef QPair<int, QTextCodec*> codecData; +typedef TQPair<int, TQTextCodec*> codecData; // class to sort codec list -class codecDataList : public QPtrList<codecData> { - int compareItems (QPtrCollection::Item a, QPtrCollection::Item b); +class codecDataList : public TQPtrList<codecData> { + int compareItems (TQPtrCollection::Item a, TQPtrCollection::Item b); }; class KGncImportOptionsDlg : public KGncImportOptionsDlgDecl { Q_OBJECT + TQ_OBJECT public: - KGncImportOptionsDlg(QWidget *parent = 0, const char *name = 0); + KGncImportOptionsDlg(TQWidget *tqparent = 0, const char *name = 0); ~KGncImportOptionsDlg(); int investmentOption () const {return (buttonInvestGroup->selectedId());}; bool quoteOption() const {return (checkFinanceQuote->isChecked());}; bool scheduleOption () const {return (checkSchedules->isChecked());}; - QTextCodec* decodeOption (); + TQTextCodec* decodeOption (); bool txNotesOption () const {return (checkTxNotes->isChecked());}; bool generalDebugOption () const {return (checkDebugGeneral->isChecked());}; bool xmlDebugOption () const {return (checkDebugXML->isChecked());}; @@ -62,7 +63,7 @@ public slots: private: void buildCodecList (); - QTextCodec* m_localeCodec; + TQTextCodec* m_localeCodec; codecDataList m_codecList; }; diff --git a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui b/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui index e32197b..852a19e 100644 --- a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui +++ b/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KGncImportOptionsDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KGncImportOptionsDlgDecl</cstring> </property> @@ -15,9 +15,9 @@ <property name="caption"> <string>GnuCash Import Options</string> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <property name="geometry"> <rect> @@ -31,18 +31,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string>Use 'Help' for more information on these options</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonInvestGroup</cstring> </property> @@ -53,7 +53,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioInvest1</cstring> </property> @@ -64,7 +64,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioInvest2</cstring> </property> @@ -72,7 +72,7 @@ <string>One investment account for all stocks</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioInvest3</cstring> </property> @@ -82,7 +82,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup5</cstring> </property> @@ -93,7 +93,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkFinanceQuote</cstring> </property> @@ -103,7 +103,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -114,7 +114,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkSchedules</cstring> </property> @@ -124,7 +124,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup4</cstring> </property> @@ -135,9 +135,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -149,7 +149,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkDecode</cstring> </property> @@ -167,14 +167,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>20</height> </size> </property> </spacer> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>comboDecode</cstring> </property> @@ -183,14 +183,14 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup18</cstring> </property> <property name="title"> <string>Transaction Notes option</string> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkTxNotes</cstring> </property> @@ -207,7 +207,7 @@ </property> </widget> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup3</cstring> </property> @@ -218,7 +218,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkDebugGeneral</cstring> </property> @@ -226,7 +226,7 @@ <string>General debug data</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkDebugXML</cstring> </property> @@ -234,7 +234,7 @@ <string>Display XML data</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkAnonymize</cstring> </property> @@ -254,16 +254,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -275,7 +275,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -299,14 +299,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>200</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -323,7 +323,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -376,8 +376,8 @@ <slot>slotHelp()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">slotHelp()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kgncpricesourcedlg.cpp b/kmymoney2/dialogs/kgncpricesourcedlg.cpp index 2246e01..5058d5b 100644 --- a/kmymoney2/dialogs/kgncpricesourcedlg.cpp +++ b/kmymoney2/dialogs/kgncpricesourcedlg.cpp @@ -17,12 +17,12 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlabel.h> -#include <qlistbox.h> -#include <qlineedit.h> -#include <qbuttongroup.h> -#include <qlayout.h> -#include <qapplication.h> +#include <tqlabel.h> +#include <tqlistbox.h> +#include <tqlineedit.h> +#include <tqbuttongroup.h> +#include <tqlayout.h> +#include <tqapplication.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -36,17 +36,17 @@ #include "kgncpricesourcedlg.h" #include "../converter/webpricequote.h" -KGncPriceSourceDlg::KGncPriceSourceDlg(QWidget *parent, const char *name) - : KGncPriceSourceDlgDecl(parent, name) +KGncPriceSourceDlg::KGncPriceSourceDlg(TQWidget *tqparent, const char *name) + : KGncPriceSourceDlgDecl(tqparent, name) { } -KGncPriceSourceDlg::KGncPriceSourceDlg(const QString &stockName, const QString &gncSource){ +KGncPriceSourceDlg::KGncPriceSourceDlg(const TQString &stockName, const TQString &gncSource){ // signals and slots connections - connect( buttonGroup5, SIGNAL( released(int) ), this, SLOT( buttonPressed(int) ) ); - connect( buttonHelp, SIGNAL( clicked() ), this, SLOT( slotHelp() ) ); + connect( buttonGroup5, TQT_SIGNAL( released(int) ), this, TQT_SLOT( buttonPressed(int) ) ); + connect( buttonHelp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotHelp() ) ); // initialize data fields - textStockName->setText (i18n ("Investment: %1").arg(stockName)); - textGncSource->setText (i18n ("Quote source: %1").arg(gncSource)); + textStockName->setText (i18n ("Investment: %1").tqarg(stockName)); + textGncSource->setText (i18n ("Quote source: %1").tqarg(gncSource)); listKnownSource->insertStringList (WebPriceQuote::quoteSources()); lineUserSource->setText (gncSource); checkAlwaysUse->setChecked(true); @@ -87,8 +87,8 @@ void KGncPriceSourceDlg::buttonPressed (int buttonId) { } } -QString KGncPriceSourceDlg::selectedSource() const { - QString s; +TQString KGncPriceSourceDlg::selectedSource() const { + TQString s; switch (m_currentButton) { case NOSOURCE: s = ""; break; case KMMSOURCE: s = listKnownSource->currentText(); break; diff --git a/kmymoney2/dialogs/kgncpricesourcedlg.h b/kmymoney2/dialogs/kgncpricesourcedlg.h index 6351b02..1d2eac6 100644 --- a/kmymoney2/dialogs/kgncpricesourcedlg.h +++ b/kmymoney2/dialogs/kgncpricesourcedlg.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qcheckbox.h> +#include <tqcheckbox.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -34,12 +34,13 @@ class KGncPriceSourceDlg : public KGncPriceSourceDlgDecl { Q_OBJECT + TQ_OBJECT public: - KGncPriceSourceDlg(QWidget *parent = 0, const char *name = 0); - KGncPriceSourceDlg(const QString &stockName, const QString &gncSource); + KGncPriceSourceDlg(TQWidget *tqparent = 0, const char *name = 0); + KGncPriceSourceDlg(const TQString &stockName, const TQString &gncSource); ~KGncPriceSourceDlg(); - QString selectedSource () const; + TQString selectedSource () const; bool alwaysUse() const { return (checkAlwaysUse->isChecked()); } public slots: diff --git a/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui b/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui index c781f81..b335268 100644 --- a/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui +++ b/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KGncPriceSourceDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KGncPriceSourceDlgDecl</cstring> </property> @@ -15,9 +15,9 @@ <property name="caption"> <string>Online Quotes - Select price source</string> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <property name="geometry"> <rect> @@ -41,14 +41,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -66,14 +66,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOK</cstring> </property> @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>171</width> <height>20</height> @@ -103,7 +103,7 @@ </spacer> </hbox> </widget> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter1</cstring> </property> @@ -118,15 +118,15 @@ <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textStockName</cstring> </property> @@ -134,7 +134,7 @@ <string></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textGncSource</cstring> </property> @@ -142,7 +142,7 @@ <string></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -150,7 +150,7 @@ <string>This price source is not known to KMyMoney. Please select an option below.</string> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup5</cstring> </property> @@ -161,7 +161,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>buttonNoSource</cstring> </property> @@ -172,7 +172,7 @@ <number>0</number> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>buttonSelectSource</cstring> </property> @@ -183,12 +183,12 @@ <number>1</number> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>listKnownSource</cstring> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>buttonUserSource</cstring> </property> @@ -200,14 +200,14 @@ <number>2</number> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>lineUserSource</cstring> </property> </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkAlwaysUse</cstring> </property> @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>370</height> @@ -244,5 +244,5 @@ <slot>close()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp b/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp index 37ddcc5..38ff094 100644 --- a/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp +++ b/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp @@ -17,9 +17,9 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -34,41 +34,41 @@ #include "kgpgkeyselectiondlg.h" #include <kmymoney/kgpgfile.h> -KGpgKeySelectionDlg::KGpgKeySelectionDlg(QWidget *parent, const char *name) : - KDialogBase(parent, name, true, i18n("Select additional keys"), Ok | Cancel), +KGpgKeySelectionDlg::KGpgKeySelectionDlg(TQWidget *tqparent, const char *name) : + KDialogBase(tqparent, name, true, i18n("Select additional keys"), Ok | Cancel), m_needCheckList(true), m_listOk(false), m_checkCount(0) { - QWidget* page = new QWidget(this); + TQWidget* page = new TQWidget(this); setMainWidget(page); - QVBoxLayout* topLayout = new QVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* topLayout = new TQVBoxLayout(page, 0, spacingHint()); m_listBox = new KEditListBox(page); m_listBox->setTitle(i18n("User identification")); m_listBox->setButtons( int( KEditListBox::Remove | KEditListBox::Add ) ); - QWhatsThis::add( m_listBox, i18n( "Enter the id of the key you want to use for data encryption. This can either be an e-mail address or the hexadecimal key id. In case of the key id don't forget the leading 0x." ) ); + TQWhatsThis::add( m_listBox, i18n( "Enter the id of the key you want to use for data encryption. This can either be an e-mail address or the hexadecimal key id. In case of the key id don't forget the leading 0x." ) ); topLayout->addWidget(m_listBox); // add a LED for the availability of all keys - QHBoxLayout* ledBox = new QHBoxLayout(0, 0, 6, "ledBoxLayout"); + TQHBoxLayout* ledBox = new TQHBoxLayout(0, 0, 6, "ledBoxLayout"); m_keyLed = new KLed(page); m_keyLed->setShape( KLed::Circular ); m_keyLed->setLook( KLed::Sunken ); ledBox->addWidget(m_keyLed); - ledBox->addWidget(new QLabel(i18n("Keys for all of the above user ids found"), page)); - ledBox->addItem(new QSpacerItem( 50, 20, QSizePolicy::Expanding, QSizePolicy::Minimum )); + ledBox->addWidget(new TQLabel(i18n("Keys for all of the above user ids found"), page)); + ledBox->addItem(new TQSpacerItem( 50, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum )); topLayout->addLayout(ledBox); - connect(m_listBox, SIGNAL(changed()), this, SLOT(slotIdChanged())); - connect(m_listBox, SIGNAL(added(const QString&)), this, SLOT(slotKeyListChanged())); - connect(m_listBox, SIGNAL(removed(const QString&)), this, SLOT(slotKeyListChanged())); + connect(m_listBox, TQT_SIGNAL(changed()), this, TQT_SLOT(slotIdChanged())); + connect(m_listBox, TQT_SIGNAL(added(const TQString&)), this, TQT_SLOT(slotKeyListChanged())); + connect(m_listBox, TQT_SIGNAL(removed(const TQString&)), this, TQT_SLOT(slotKeyListChanged())); } -void KGpgKeySelectionDlg::setKeys(const QStringList& list) +void KGpgKeySelectionDlg::setKeys(const TQStringList& list) { m_listBox->clear(); m_listBox->insertStringList(list); @@ -78,9 +78,9 @@ void KGpgKeySelectionDlg::setKeys(const QStringList& list) #if 0 void KGpgKeySelectionDlg::slotShowHelp(void) { - QString anchor = m_helpAnchor[m_criteriaTab->currentPage()]; + TQString anchor = m_helpAnchor[m_criteriaTab->currentPage()]; if(anchor.isEmpty()) - anchor = QString("details.search"); + anchor = TQString("details.search"); kapp->invokeHelp(anchor); } @@ -114,8 +114,8 @@ void KGpgKeySelectionDlg::slotIdChanged(void) // if it is available, then scan the current list if we need to if(keysOk) { if(m_needCheckList) { - QStringList keys = m_listBox->items(); - QStringList::const_iterator it_s; + TQStringList keys = m_listBox->items(); + TQStringList::const_iterator it_s; for(it_s = keys.begin(); keysOk && it_s != keys.end(); ++it_s) { if(!KGPGFile::keyAvailable(*it_s)) keysOk = false; diff --git a/kmymoney2/dialogs/kgpgkeyselectiondlg.h b/kmymoney2/dialogs/kgpgkeyselectiondlg.h index 4355478..35b86b4 100644 --- a/kmymoney2/dialogs/kgpgkeyselectiondlg.h +++ b/kmymoney2/dialogs/kgpgkeyselectiondlg.h @@ -36,20 +36,21 @@ class KLed; class KGpgKeySelectionDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KGpgKeySelectionDlg(QWidget *parent=0, const char *name=0); + KGpgKeySelectionDlg(TQWidget *tqparent=0, const char *name=0); virtual ~KGpgKeySelectionDlg() {} /** * preset the key list with the given key ids in @a list */ - void setKeys(const QStringList& list); + void setKeys(const TQStringList& list); /** * Returns the list of keys currently listed in the KEditListBox */ - const QStringList keys(void) const { return m_listBox->items(); } + const TQStringList keys(void) const { return m_listBox->items(); } protected slots: void slotIdChanged(void); diff --git a/kmymoney2/dialogs/kimportdlg.cpp b/kmymoney2/dialogs/kimportdlg.cpp index c9cc2d5..e8489d2 100644 --- a/kmymoney2/dialogs/kimportdlg.cpp +++ b/kmymoney2/dialogs/kimportdlg.cpp @@ -21,13 +21,13 @@ // ---------------------------------------------------------------------------- // QT Headers -#include <qlineedit.h> -#include <qtextstream.h> -#include <qprogressbar.h> -#include <qlabel.h> -#include <qbuttongroup.h> -#include <qpixmap.h> -#include <qapplication.h> +#include <tqlineedit.h> +#include <tqtextstream.h> +#include <tqprogressbar.h> +#include <tqlabel.h> +#include <tqbuttongroup.h> +#include <tqpixmap.h> +#include <tqapplication.h> // ---------------------------------------------------------------------------- // KDE Headers @@ -51,8 +51,8 @@ #include "mymoneyqifprofileeditor.h" #include "../converter/mymoneyqifprofile.h" -KImportDlg::KImportDlg(QWidget *parent, const char * name) - : KImportDlgDecl(parent, name, TRUE) +KImportDlg::KImportDlg(TQWidget *tqparent, const char * name) + : KImportDlgDecl(tqparent, name, TRUE) { // Set all the last used options readConfig(); @@ -64,32 +64,32 @@ KImportDlg::KImportDlg(QWidget *parent, const char * name) KIconLoader* il = KGlobal::iconLoader(); KGuiItem okButtenItem( i18n( "&Import" ), - QIconSet(il->loadIcon("fileimport", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("fileimport", KIcon::Small, KIcon::SizeSmall)), i18n("Start operation"), i18n("Use this to start the import operation")); m_qbuttonOk->setGuiItem(okButtenItem); KGuiItem browseButtenItem( i18n( "&Browse..." ), - QIconSet(il->loadIcon("fileopen", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("fileopen", KIcon::Small, KIcon::SizeSmall)), i18n("Select filename"), i18n("Use this to select a filename to export to")); m_qbuttonBrowse->setGuiItem(browseButtenItem); KGuiItem newButtenItem( i18n( "&New..." ), - QIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), i18n("Create a new profile"), i18n("Use this to open the profile editor")); m_profileEditorButton->setGuiItem(newButtenItem); // connect the buttons to their functionality - connect(m_qbuttonBrowse, SIGNAL( clicked() ), this, SLOT( slotBrowse() ) ); - connect(m_qbuttonOk, SIGNAL(clicked()), this, SLOT(slotOkClicked())); - connect(m_qbuttonCancel, SIGNAL(clicked()), this, SLOT(reject())); - connect(m_profileEditorButton, SIGNAL(clicked()), this, SLOT(slotNewProfile())); + connect(m_qbuttonBrowse, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowse() ) ); + connect(m_qbuttonOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOkClicked())); + connect(m_qbuttonCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(m_profileEditorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewProfile())); // connect the change signals to the check slot and perform initial check - connect(m_qlineeditFile, SIGNAL(textChanged(const QString&)), this, - SLOT(slotFileTextChanged(const QString&))); + connect(m_qlineeditFile, TQT_SIGNAL(textChanged(const TQString&)), this, + TQT_SLOT(slotFileTextChanged(const TQString&))); // setup button enable status slotFileTextChanged(m_qlineeditFile->text()); @@ -107,11 +107,11 @@ void KImportDlg::slotBrowse() tmpprofile.loadProfile("Profile-" + profile()); KFileDialog dialog(KGlobalSettings::documentPath(), - i18n("%1|Import files\n%2|All files (*.*)").arg(tmpprofile.filterFileType()).arg("*"), + i18n("%1|Import files\n%2|All files (*.*)").tqarg(tmpprofile.filterFileType()).tqarg("*"), this, i18n("Import File..."), true); dialog.setMode(KFile::File | KFile::ExistingOnly); - if(dialog.exec() == QDialog::Accepted) { + if(dialog.exec() == TQDialog::Accepted) { #if KDE_IS_VERSION(3,4,0) m_qlineeditFile->setText(dialog.selectedURL().pathOrURL()); #else @@ -145,9 +145,9 @@ void KImportDlg::writeConfig(void) } /** Make sure the text input is ok */ -void KImportDlg::slotFileTextChanged(const QString& text) +void KImportDlg::slotFileTextChanged(const TQString& text) { - if (!text.isEmpty() && KIO::NetAccess::exists(text, true, qApp->mainWidget())) { + if (!text.isEmpty() && KIO::NetAccess::exists(text, true, tqApp->mainWidget())) { // m_qcomboboxDateFormat->setEnabled(true); m_qbuttonOk->setEnabled(true); m_qlineeditFile->setText(text); @@ -159,7 +159,7 @@ void KImportDlg::slotFileTextChanged(const QString& text) void KImportDlg::slotNewProfile(void) { - MyMoneyQifProfileEditor* editor = new MyMoneyQifProfileEditor(true, this, "QIF Profile Editor"); + MyMoneyQifProfileEditor* editor = new MyMoneyQifProfileEditor(true, this, "TQIF Profile Editor"); if(editor->exec()) { m_profileComboBox->setCurrentText(editor->selectedProfile()); @@ -169,7 +169,7 @@ void KImportDlg::slotNewProfile(void) delete editor; } -void KImportDlg::slotSelectProfile(const QString& profile) +void KImportDlg::slotSelectProfile(const TQString& profile) { m_profileComboBox->setCurrentText(profile); loadProfiles(); @@ -183,11 +183,11 @@ void KImportDlg::loadProfiles(const bool selectLast) edit->slotOk(); delete edit; - QString current = m_profileComboBox->currentText(); + TQString current = m_profileComboBox->currentText(); m_profileComboBox->clear(); - QStringList list; + TQStringList list; KConfig* config = KGlobal::config(); config->setGroup("Profiles"); @@ -201,20 +201,20 @@ void KImportDlg::loadProfiles(const bool selectLast) } m_profileComboBox->setCurrentItem(0); - if(list.contains(current) > 0) { + if(list.tqcontains(current) > 0) { m_profileComboBox->setCurrentText(current); } } -void KImportDlg::addCategories(QStringList& strList, const QString& id, const QString& leadIn) const +void KImportDlg::addCategories(TQStringList& strList, const TQString& id, const TQString& leadIn) const { MyMoneyFile *file = MyMoneyFile::instance(); - QString name; + TQString name; MyMoneyAccount account = file->account(id); - QStringList accList = account.accountList(); - QStringList::ConstIterator it_a; + TQStringList accList = account.accountList(); + TQStringList::ConstIterator it_a; for(it_a = accList.begin(); it_a != accList.end(); ++it_a) { account = file->account(*it_a); diff --git a/kmymoney2/dialogs/kimportdlg.h b/kmymoney2/dialogs/kimportdlg.h index 06f1003..119d77d 100644 --- a/kmymoney2/dialogs/kimportdlg.h +++ b/kmymoney2/dialogs/kimportdlg.h @@ -22,9 +22,9 @@ // ---------------------------------------------------------------------------- // QT Headers -#include <qstring.h> -#include <qlineedit.h> -#include <qcheckbox.h> +#include <tqstring.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> // ---------------------------------------------------------------------------- // KDE Headers @@ -39,8 +39,8 @@ /** * This class is used to import a qif file to an account. - * It relies upon the QIF file handling routines in MyMoneyAccount to do - * the actual writing of QIF files. + * It relies upon the TQIF file handling routines in MyMoneyAccount to do + * the actual writing of TQIF files. * * It uses the global KConfig object to read and write the application * settings. @@ -54,30 +54,31 @@ class KImportDlg : public KImportDlgDecl { Q_OBJECT + TQ_OBJECT public: /** * Standard constructor */ - KImportDlg(QWidget *parent, const char *name = 0); + KImportDlg(TQWidget *tqparent, const char *name = 0); /** Standard destructor */ ~KImportDlg(); /** */ - const QString filename(void) const { return m_qlineeditFile->text(); }; + const TQString filename(void) const { return m_qlineeditFile->text(); }; /** */ - const QString profile(void) const { return m_profileComboBox->currentText(); }; + const TQString profile(void) const { return m_profileComboBox->currentText(); }; protected slots: - /** Called to let the user browse for a QIF file to import from. */ + /** Called to let the user browse for a TQIF file to import from. */ void slotBrowse(); /** Test whether to enable the buttons */ - void slotFileTextChanged(const QString& text); + void slotFileTextChanged(const TQString& text); /** * Called when the user needs a new profile @@ -86,7 +87,7 @@ protected slots: void slotOkClicked(void); - void slotSelectProfile(const QString& text); + void slotSelectProfile(const TQString& text); private: /** @@ -109,7 +110,7 @@ private: * @param id Account id to add * @param leadIn constant leadin to be added in front of the account name */ - void addCategories(QStringList& strList, const QString& id, const QString& leadIn) const; + void addCategories(TQStringList& strList, const TQString& id, const TQString& leadIn) const; void readConfig(void); void writeConfig(void); diff --git a/kmymoney2/dialogs/kimportdlgdecl.ui b/kmymoney2/dialogs/kimportdlgdecl.ui index c915f12..0ebd81b 100644 --- a/kmymoney2/dialogs/kimportdlgdecl.ui +++ b/kmymoney2/dialogs/kimportdlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KImportDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KImportDlgDecl</cstring> </property> @@ -50,15 +50,15 @@ Please enter the path to the QIF file or select it by clicking on the Browse but <set>AutoAll</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblImportFile</cstring> </property> @@ -74,7 +74,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but <string>QIF File to Import:</string> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_optionGroupBox</cstring> </property> @@ -103,7 +103,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but <string>Select <b>Bank statement</b> turns on automatic category matching which is turned off in case of <b>Historic data</b>. Use the latter if you import files from other Personal Finance Management software.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -111,7 +111,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but <string>Source of QIF</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -131,7 +131,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -159,7 +159,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but <string>Browse...</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>m_qlineeditFile</cstring> </property> @@ -180,7 +180,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout90</cstring> </property> @@ -204,7 +204,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>411</width> <height>0</height> @@ -242,5 +242,5 @@ Please enter the path to the QIF file or select it by clicking on the Browse but </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kloadtemplatedlg.cpp b/kmymoney2/dialogs/kloadtemplatedlg.cpp index d765f8a..3666281 100644 --- a/kmymoney2/dialogs/kloadtemplatedlg.cpp +++ b/kmymoney2/dialogs/kloadtemplatedlg.cpp @@ -33,17 +33,17 @@ #include "kloadtemplatedlg.h" #include "../widgets/kaccounttemplateselector.h" -KLoadTemplateDlg::KLoadTemplateDlg(QWidget* parent, const char* name) : - KLoadTemplateDlgDecl(parent, name) +KLoadTemplateDlg::KLoadTemplateDlg(TQWidget* tqparent, const char* name) : + KLoadTemplateDlgDecl(tqparent, name) { buttonOk->setGuiItem(KStdGuiItem::ok()); buttonCancel->setGuiItem(KStdGuiItem::cancel()); buttonHelp->setGuiItem(KStdGuiItem::help()); - connect(buttonHelp, SIGNAL(clicked()), this, SLOT(slotHelp())); + connect(buttonHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp())); } -QValueList<MyMoneyTemplate> KLoadTemplateDlg::templates(void) const +TQValueList<MyMoneyTemplate> KLoadTemplateDlg::templates(void) const { return m_templateSelector->selectedTemplates(); } diff --git a/kmymoney2/dialogs/kloadtemplatedlg.h b/kmymoney2/dialogs/kloadtemplatedlg.h index 44fdfee..d2f36b1 100644 --- a/kmymoney2/dialogs/kloadtemplatedlg.h +++ b/kmymoney2/dialogs/kloadtemplatedlg.h @@ -33,11 +33,12 @@ class KLoadTemplateDlg : public KLoadTemplateDlgDecl { Q_OBJECT + TQ_OBJECT public: - KLoadTemplateDlg(QWidget *parent = 0, const char *name = 0); + KLoadTemplateDlg(TQWidget *tqparent = 0, const char *name = 0); - QValueList<MyMoneyTemplate> templates(void) const; + TQValueList<MyMoneyTemplate> templates(void) const; private slots: void slotHelp(void); diff --git a/kmymoney2/dialogs/kloadtemplatedlgdecl.ui b/kmymoney2/dialogs/kloadtemplatedlgdecl.ui index 4790de9..4e9b4e9 100644 --- a/kmymoney2/dialogs/kloadtemplatedlgdecl.ui +++ b/kmymoney2/dialogs/kloadtemplatedlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KLoadTemplateDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KLoadTemplateDlgDecl</cstring> </property> @@ -27,9 +27,9 @@ <cstring>m_templateSelector</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>228</width> <height>20</height> @@ -102,5 +102,8 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kaccounttemplateselector.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kmergetransactionsdlg.cpp b/kmymoney2/dialogs/kmergetransactionsdlg.cpp index 692c88f..99dadbd 100644 --- a/kmymoney2/dialogs/kmergetransactionsdlg.cpp +++ b/kmymoney2/dialogs/kmergetransactionsdlg.cpp @@ -31,8 +31,8 @@ #include "kmergetransactionsdlg.h" -KMergeTransactionsDlg::KMergeTransactionsDlg(const MyMoneyAccount& account, QWidget* parent, const char* name) : - KSelectTransactionsDlg(account, parent, name) +KMergeTransactionsDlg::KMergeTransactionsDlg(const MyMoneyAccount& account, TQWidget* tqparent, const char* name) : + KSelectTransactionsDlg(account, tqparent, name) { // setup descriptive texts @@ -40,7 +40,7 @@ KMergeTransactionsDlg::KMergeTransactionsDlg(const MyMoneyAccount& account, QWid m_description->setText(i18n("Are you sure you wish to merge these transactions?")); // no selection possible - m_register->setSelectionMode(QTable::NoSelection); + m_register->setSelectionMode(TQTable::NoSelection); // override default and enable ok button right away buttonOk->setEnabled(true); diff --git a/kmymoney2/dialogs/kmergetransactionsdlg.h b/kmymoney2/dialogs/kmergetransactionsdlg.h index ebbfd82..23d1d5d 100644 --- a/kmymoney2/dialogs/kmergetransactionsdlg.h +++ b/kmymoney2/dialogs/kmergetransactionsdlg.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- // QT Includes -class QResizeEvent; +class TQResizeEvent; // ---------------------------------------------------------------------------- // KDE Includes @@ -39,10 +39,11 @@ class QResizeEvent; class KMergeTransactionsDlg: public KSelectTransactionsDlg { Q_OBJECT + TQ_OBJECT public: - KMergeTransactionsDlg(const MyMoneyAccount& account, QWidget* parent = 0, const char* name = 0); + KMergeTransactionsDlg(const MyMoneyAccount& account, TQWidget* tqparent = 0, const char* name = 0); - bool eventFilter(QObject* , QEvent* ) { return false; } + bool eventFilter(TQObject* , TQEvent* ) { return false; } public slots: void slotHelp(); diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp b/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp index 108c776..c7ae4b1 100644 --- a/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp +++ b/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlabel.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -34,8 +34,8 @@ #include <kmymoney/mymoneyfile.h> #include <kmymoney/kmymoneyutils.h> -KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(QWidget *parent, const char *name ) - : KMyMoneyFileInfoDlgDecl(parent, name) +KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(TQWidget *tqparent, const char *name ) + : KMyMoneyFileInfoDlgDecl(tqparent, name) { // Hide the unused buttons. buttonCancel->hide(); @@ -48,16 +48,16 @@ KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(QWidget *parent, const char *name ) m_lastModificationDate->setText(storage->lastModificationDate().toString(Qt::ISODate)); m_baseCurrency->setText(storage->value("kmm-baseCurrency")); - m_payeeCount->setText(QString("%1").arg(storage->payeeList().count())); - m_institutionCount->setText(QString("%1").arg(storage->institutionList().count())); + m_payeeCount->setText(TQString("%1").tqarg(storage->payeeList().count())); + m_institutionCount->setText(TQString("%1").tqarg(storage->institutionList().count())); - QValueList<MyMoneyAccount> a_list; + TQValueList<MyMoneyAccount> a_list; storage->accountList(a_list); - m_accountCount->setText(QString("%1").arg(a_list.count())); + m_accountCount->setText(TQString("%1").tqarg(a_list.count())); - QMap<MyMoneyAccount::accountTypeE, int> accountMap; - QMap<MyMoneyAccount::accountTypeE, int> accountMapClosed; - QValueList<MyMoneyAccount>::const_iterator it_a; + TQMap<MyMoneyAccount::accountTypeE, int> accountMap; + TQMap<MyMoneyAccount::accountTypeE, int> accountMapClosed; + TQValueList<MyMoneyAccount>::const_iterator it_a; for(it_a = a_list.begin(); it_a != a_list.end(); ++it_a) { accountMap[(*it_a).accountType()] = accountMap[(*it_a).accountType()] + 1; accountMapClosed[(*it_a).accountType()] = accountMapClosed[(*it_a).accountType()] + 0; @@ -65,24 +65,24 @@ KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(QWidget *parent, const char *name ) accountMapClosed[(*it_a).accountType()] = accountMapClosed[(*it_a).accountType()] + 1; } - QMap<MyMoneyAccount::accountTypeE, int>::const_iterator it_m; + TQMap<MyMoneyAccount::accountTypeE, int>::const_iterator it_m; for(it_m = accountMap.begin(); it_m != accountMap.end(); ++it_m) { - new KListViewItem(m_accountView, KMyMoneyUtils::accountTypeToString(it_m.key()), QString("%1").arg(*it_m), QString("%1").arg(accountMapClosed[it_m.key()])); + new KListViewItem(m_accountView, KMyMoneyUtils::accountTypeToString(it_m.key()), TQString("%1").tqarg(*it_m), TQString("%1").tqarg(accountMapClosed[it_m.key()])); } MyMoneyTransactionFilter filter; filter.setReportAllSplits(false); - m_transactionCount->setText(QString("%1").arg(storage->transactionList(filter).count())); + m_transactionCount->setText(TQString("%1").tqarg(storage->transactionList(filter).count())); filter.setReportAllSplits(true); - m_splitCount->setText(QString("%1").arg(storage->transactionList(filter).count())); - m_scheduleCount->setText(QString("%1").arg(storage->scheduleList().count())); + m_splitCount->setText(TQString("%1").tqarg(storage->transactionList(filter).count())); + m_scheduleCount->setText(TQString("%1").tqarg(storage->scheduleList().count())); MyMoneyPriceList list = storage->priceList(); MyMoneyPriceList::const_iterator it_p; int pCount = 0; for(it_p = list.begin(); it_p != list.end(); ++it_p) pCount += (*it_p).count(); - m_priceCount->setText(QString("%1").arg(pCount)); + m_priceCount->setText(TQString("%1").tqarg(pCount)); } KMyMoneyFileInfoDlg::~KMyMoneyFileInfoDlg() diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlg.h b/kmymoney2/dialogs/kmymoneyfileinfodlg.h index 9ba7f56..548b5a3 100644 --- a/kmymoney2/dialogs/kmymoneyfileinfodlg.h +++ b/kmymoney2/dialogs/kmymoneyfileinfodlg.h @@ -36,8 +36,9 @@ class KMyMoneyFileInfoDlg : public KMyMoneyFileInfoDlgDecl { Q_OBJECT + TQ_OBJECT public: - KMyMoneyFileInfoDlg(QWidget *parent=0, const char *name=0); + KMyMoneyFileInfoDlg(TQWidget *tqparent=0, const char *name=0); virtual ~KMyMoneyFileInfoDlg(); }; diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui index fe2cd18..58528ed 100644 --- a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui +++ b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KMyMoneyFileInfoDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KMyMoneyFileInfoDlgDecl</cstring> </property> @@ -25,15 +25,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_baseCurrency</cstring> </property> @@ -41,7 +41,7 @@ <string>x</string> </property> </widget> - <widget class="QLabel" row="9" column="1"> + <widget class="TQLabel" row="9" column="1"> <property name="name"> <cstring>m_scheduleCount</cstring> </property> @@ -96,7 +96,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -104,7 +104,7 @@ <string>Accounts/Categories</string> </property> </widget> - <widget class="QLabel" row="10" column="0"> + <widget class="TQLabel" row="10" column="0"> <property name="name"> <cstring>textLabel19</cstring> </property> @@ -112,7 +112,7 @@ <string>Prices</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -120,7 +120,7 @@ <string>Created on</string> </property> </widget> - <widget class="QLabel" row="10" column="1"> + <widget class="TQLabel" row="10" column="1"> <property name="name"> <cstring>m_priceCount</cstring> </property> @@ -128,7 +128,7 @@ <string>x</string> </property> </widget> - <widget class="QLabel" row="9" column="0"> + <widget class="TQLabel" row="9" column="0"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -136,7 +136,7 @@ <string>Schedules</string> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -144,7 +144,7 @@ <string>Transactions</string> </property> </widget> - <widget class="QLabel" row="8" column="0"> + <widget class="TQLabel" row="8" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -152,7 +152,7 @@ <string>Splits</string> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>m_payeeCount</cstring> </property> @@ -160,7 +160,7 @@ <string>x</string> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>m_institutionCount</cstring> </property> @@ -168,7 +168,7 @@ <string>x</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -176,7 +176,7 @@ <string>Institutions</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_creationDate</cstring> </property> @@ -184,7 +184,7 @@ <string>x</string> </property> </widget> - <widget class="QLabel" row="7" column="1"> + <widget class="TQLabel" row="7" column="1"> <property name="name"> <cstring>m_transactionCount</cstring> </property> @@ -192,7 +192,7 @@ <string>x</string> </property> </widget> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>m_accountCount</cstring> </property> @@ -200,7 +200,7 @@ <string>x</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -208,7 +208,7 @@ <string>Payees</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -216,7 +216,7 @@ <string>Base currency</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -224,7 +224,7 @@ <string>Last modified on</string> </property> </widget> - <widget class="QLabel" row="8" column="1"> + <widget class="TQLabel" row="8" column="1"> <property name="name"> <cstring>m_splitCount</cstring> </property> @@ -232,7 +232,7 @@ <string>x</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_lastModificationDate</cstring> </property> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -273,15 +273,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -305,7 +305,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>120</width> <height>20</height> @@ -354,5 +354,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kmymoneypricedlg.cpp b/kmymoney2/dialogs/kmymoneypricedlg.cpp index cd8d66f..a64fd13 100644 --- a/kmymoney2/dialogs/kmymoneypricedlg.cpp +++ b/kmymoney2/dialogs/kmymoneypricedlg.cpp @@ -23,7 +23,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qcheckbox.h> +#include <tqcheckbox.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -53,47 +53,47 @@ #define PRICE_COL 3 #define SOURCE_COL 4 -KMyMoneyPriceDlg::KMyMoneyPriceDlg(QWidget* parent, const char *name) : - KMyMoneyPriceDlgDecl(parent, name) +KMyMoneyPriceDlg::KMyMoneyPriceDlg(TQWidget* tqparent, const char *name) : + KMyMoneyPriceDlgDecl(tqparent, name) { KIconLoader *il = KGlobal::iconLoader(); KGuiItem removeButtenItem( i18n( "&Delete" ), - QIconSet(il->loadIcon("delete", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("delete", KIcon::Small, KIcon::SizeSmall)), i18n("Delete this entry"), i18n("Remove this price item from the file")); m_deleteButton->setGuiItem(removeButtenItem); KGuiItem newButtenItem( i18n( "&New" ), - QIconSet(il->loadIcon("file_new", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("file_new", KIcon::Small, KIcon::SizeSmall)), i18n("Add a new entry"), i18n("Create a new price entry.")); m_newButton->setGuiItem(newButtenItem); KGuiItem editButtenItem( i18n( "&Edit" ), - QIconSet(il->loadIcon("edit", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("edit", KIcon::Small, KIcon::SizeSmall)), i18n("Modify the selected entry"), i18n("Change the details of selected price information.")); m_editButton->setGuiItem(editButtenItem); KGuiItem okButtenItem( i18n("&Close" ), - QIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)), i18n("Close the dialog"), i18n("Use this to close the dialog and return to the application.")); m_closeButton->setGuiItem(okButtenItem); - connect(m_closeButton, SIGNAL(clicked()), this, SLOT(accept())); - connect(m_editButton, SIGNAL(clicked()), this, SLOT(slotEditPrice())); - connect(m_priceList, SIGNAL(editPrice()), this, SLOT(slotEditPrice())); - connect(m_deleteButton, SIGNAL(clicked()), this, SLOT(slotDeletePrice())); - connect(m_priceList, SIGNAL(deletePrice()), this, SLOT(slotDeletePrice())); - connect(m_newButton, SIGNAL(clicked()), this, SLOT(slotNewPrice())); - connect(m_priceList, SIGNAL(newPrice()), this, SLOT(slotNewPrice())); - connect(m_priceList, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotSelectPrice(QListViewItem*))); - connect(m_onlineQuoteButton, SIGNAL(clicked()), this, SLOT(slotOnlinePriceUpdate())); - connect(m_priceList, SIGNAL(onlinePriceUpdate()), this, SLOT(slotOnlinePriceUpdate())); + connect(m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect(m_editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditPrice())); + connect(m_priceList, TQT_SIGNAL(editPrice()), this, TQT_SLOT(slotEditPrice())); + connect(m_deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeletePrice())); + connect(m_priceList, TQT_SIGNAL(deletePrice()), this, TQT_SLOT(slotDeletePrice())); + connect(m_newButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewPrice())); + connect(m_priceList, TQT_SIGNAL(newPrice()), this, TQT_SLOT(slotNewPrice())); + connect(m_priceList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectPrice(TQListViewItem*))); + connect(m_onlineQuoteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOnlinePriceUpdate())); + connect(m_priceList, TQT_SIGNAL(onlinePriceUpdate()), this, TQT_SLOT(slotOnlinePriceUpdate())); - connect(m_showAllPrices, SIGNAL(toggled(bool)), this, SLOT(slotLoadWidgets())); - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotLoadWidgets())); + connect(m_showAllPrices, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotLoadWidgets())); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets())); slotLoadWidgets(); slotSelectPrice(0); @@ -128,7 +128,7 @@ void KMyMoneyPriceDlg::slotLoadWidgets(void) } } -void KMyMoneyPriceDlg::slotSelectPrice(QListViewItem * item) +void KMyMoneyPriceDlg::slotSelectPrice(TQListViewItem * item) { m_currentItem = item; m_editButton->setEnabled(item != 0); @@ -162,7 +162,7 @@ void KMyMoneyPriceDlg::slotNewPrice(void) m_priceList->setSelected(p, true); // If the user cancels the following operation, we delete the new item // and re-select any previously selected one - if(slotEditPrice() == QDialog::Rejected) { + if(slotEditPrice() == TQDialog::Rejected) { delete p; if(item) m_priceList->setSelected(item, true); @@ -172,7 +172,7 @@ void KMyMoneyPriceDlg::slotNewPrice(void) int KMyMoneyPriceDlg::slotEditPrice(void) { - int rc = QDialog::Rejected; + int rc = TQDialog::Rejected; KMyMoneyPriceItem* item = dynamic_cast<KMyMoneyPriceItem*>(m_priceList->selectedItem()); if(item) { MyMoneySecurity from(MyMoneyFile::instance()->security(item->price().from())); @@ -217,11 +217,11 @@ void KMyMoneyPriceDlg::slotOnlinePriceUpdate(void) if(item) { KEquityPriceUpdateDlg dlg(this, (item->text(COMMODITY_COL)+" "+item->text(CURRENCY_COL)).utf8()); - if(dlg.exec() == QDialog::Accepted) + if(dlg.exec() == TQDialog::Accepted) dlg.storePrices(); } else { KEquityPriceUpdateDlg dlg(this); - if(dlg.exec() == QDialog::Accepted) + if(dlg.exec() == TQDialog::Accepted) dlg.storePrices(); } } @@ -234,9 +234,9 @@ void KMyMoneyPriceDlg::slotOnlinePriceUpdate(void) // complains and if not, we get rid of this whole block one day. (2007-06-22 ipwizard) // // kmymoney2/widgets/kmymoneypriceview.cpp:179: undefined reference to -// `KUpdateStockPriceDlg::KUpdateStockPriceDlg[in-charge](QWidget*, char const*)' +// `KUpdateStockPriceDlg::KUpdateStockPriceDlg[in-charge](TQWidget*, char const*)' // kmymoney2/widgets/kmymoneypriceview.cpp:204: undefined reference to -// `KUpdateStockPriceDlg::KUpdateStockPriceDlg[in-charge](QDate const&, QString const&, QWidget*, char const*)' +// `KUpdateStockPriceDlg::KUpdateStockPriceDlg[in-charge](TQDate const&, TQString const&, TQWidget*, char const*)' void KEditEquityEntryDlg_useless(void) { delete new KUpdateStockPriceDlg(); diff --git a/kmymoney2/dialogs/kmymoneypricedlg.h b/kmymoney2/dialogs/kmymoneypricedlg.h index c7e7c99..c3c23e5 100644 --- a/kmymoney2/dialogs/kmymoneypricedlg.h +++ b/kmymoney2/dialogs/kmymoneypricedlg.h @@ -26,7 +26,7 @@ // ---------------------------------------------------------------------------- // QT Includes -class QListViewItem; +class TQListViewItem; // ---------------------------------------------------------------------------- // KDE Includes @@ -40,12 +40,13 @@ class QListViewItem; class KMyMoneyPriceDlg : public KMyMoneyPriceDlgDecl { Q_OBJECT + TQ_OBJECT public: - KMyMoneyPriceDlg(QWidget* parent, const char *name); + KMyMoneyPriceDlg(TQWidget* tqparent, const char *name); ~KMyMoneyPriceDlg(); protected slots: - void slotSelectPrice(QListViewItem* item); + void slotSelectPrice(TQListViewItem* item); void slotNewPrice(void); void slotDeletePrice(void); int slotEditPrice(void); @@ -53,7 +54,7 @@ protected slots: void slotOnlinePriceUpdate(void); private: - QListViewItem* m_currentItem; + TQListViewItem* m_currentItem; }; #endif // KMYMONEYPRICEDLG_H diff --git a/kmymoney2/dialogs/kmymoneypricedlgdecl.ui b/kmymoney2/dialogs/kmymoneypricedlgdecl.ui index 27895e3..424c25d 100644 --- a/kmymoney2/dialogs/kmymoneypricedlgdecl.ui +++ b/kmymoney2/dialogs/kmymoneypricedlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KMyMoneyPriceDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KMyMoneyPriceDlgDecl</cstring> </property> @@ -19,17 +19,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <vbox> <property name="name"> @@ -40,7 +40,7 @@ <cstring>m_priceList</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_showAllPrices</cstring> </property> @@ -50,9 +50,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>150</height> @@ -133,9 +133,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -151,16 +151,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>560</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -216,5 +216,5 @@ <tabstop>m_onlineQuoteButton</tabstop> <tabstop>m_closeButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp index 5b5f1af..d1182ec 100644 --- a/kmymoney2/dialogs/kmymoneysplittable.cpp +++ b/kmymoney2/dialogs/kmymoneysplittable.cpp @@ -25,13 +25,13 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qglobal.h> -#include <qpainter.h> -#include <qcursor.h> -#include <qapplication.h> -#include <qtimer.h> -#include <qlayout.h> -#include <qeventloop.h> +#include <tqglobal.h> +#include <tqpainter.h> +#include <tqcursor.h> +#include <tqapplication.h> +#include <tqtimer.h> +#include <tqlayout.h> +#include <tqeventloop.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -62,8 +62,8 @@ #include "../mymoney/mymoneyutils.h" -kMyMoneySplitTable::kMyMoneySplitTable(QWidget *parent, const char *name ) : - QTable(parent,name), +kMyMoneySplitTable::kMyMoneySplitTable(TQWidget *tqparent, const char *name ) : + TQTable(tqparent,name), m_currentRow(0), m_maxRows(0), m_editMode(false), @@ -78,7 +78,7 @@ kMyMoneySplitTable::kMyMoneySplitTable(QWidget *parent, const char *name ) : horizontalHeader()->setLabel(0, i18n("Category")); horizontalHeader()->setLabel(1, i18n("Memo")); horizontalHeader()->setLabel(2, i18n("Amount")); - setSelectionMode(QTable::NoSelection); + setSelectionMode(TQTable::NoSelection); setLeftMargin(0); verticalHeader()->hide(); setColumnStretchable(0, false); @@ -88,63 +88,63 @@ kMyMoneySplitTable::kMyMoneySplitTable(QWidget *parent, const char *name ) : horizontalHeader()->setMovingEnabled(false); horizontalHeader()->setFont(KMyMoneyGlobalSettings::listHeaderFont()); - setVScrollBarMode(QScrollView::AlwaysOn); + setVScrollBarMode(TQScrollView::AlwaysOn); // never show a horizontal scroll bar - setHScrollBarMode(QScrollView::AlwaysOff); + setHScrollBarMode(TQScrollView::AlwaysOff); // setup the context menu m_contextMenu = new KPopupMenu(this); KIconLoader *il = KGlobal::iconLoader(); m_contextMenu->insertTitle(il->loadIcon("transaction", KIcon::MainToolbar), i18n("Split Options")); - m_contextMenu->insertItem(il->loadIcon("edit", KIcon::Small), i18n("Edit..."), this, SLOT(slotStartEdit())); - m_contextMenuDuplicate = m_contextMenu->insertItem(il->loadIcon("editcopy", KIcon::Small), i18n("Duplicate"), this, SLOT(slotDuplicateSplit())); + m_contextMenu->insertItem(il->loadIcon("edit", KIcon::Small), i18n("Edit..."), this, TQT_SLOT(slotStartEdit())); + m_contextMenuDuplicate = m_contextMenu->insertItem(il->loadIcon("editcopy", KIcon::Small), i18n("Duplicate"), this, TQT_SLOT(slotDuplicateSplit())); m_contextMenuDelete = m_contextMenu->insertItem(il->loadIcon("delete", KIcon::Small), i18n("Delete ..."), - this, SLOT(slotDeleteSplit())); + this, TQT_SLOT(slotDeleteSplit())); - connect(this, SIGNAL(clicked(int, int, int, const QPoint&)), - this, SLOT(slotSetFocus(int, int, int, const QPoint&))); + connect(this, TQT_SIGNAL(clicked(int, int, int, const TQPoint&)), + this, TQT_SLOT(slotSetFocus(int, int, int, const TQPoint&))); - connect(this, SIGNAL(transactionChanged(const MyMoneyTransaction&)), - this, SLOT(slotUpdateData(const MyMoneyTransaction&))); + connect(this, TQT_SIGNAL(transactionChanged(const MyMoneyTransaction&)), + this, TQT_SLOT(slotUpdateData(const MyMoneyTransaction&))); } kMyMoneySplitTable::~kMyMoneySplitTable() { } -void kMyMoneySplitTable::setup(const QMap<QString, MyMoneyMoney>& priceInfo) +void kMyMoneySplitTable::setup(const TQMap<TQString, MyMoneyMoney>& priceInfo) { m_priceInfo = priceInfo; } -const QColor kMyMoneySplitTable::rowBackgroundColor(const int row) const +const TQColor kMyMoneySplitTable::rowBackgroundColor(const int row) const { return (row % 2) ? KMyMoneyGlobalSettings::listColor() : KMyMoneyGlobalSettings::listBGColor(); } -void kMyMoneySplitTable::paintCell(QPainter *p, int row, int col, const QRect& r, bool /*selected*/) +void kMyMoneySplitTable::paintCell(TQPainter *p, int row, int col, const TQRect& r, bool /*selected*/) { - QColorGroup g = colorGroup(); - QColor textColor; + TQColorGroup g = tqcolorGroup(); + TQColor textColor; - g.setColor(QColorGroup::Base, rowBackgroundColor(row)); + g.setColor(TQColorGroup::Base, rowBackgroundColor(row)); p->setFont(KMyMoneyGlobalSettings::listCellFont()); - QString firsttext = text(row, col); - QString qstringCategory; - QString qstringMemo; + TQString firsttext = text(row, col); + TQString qstringCategory; + TQString qstringMemo; - int intPos = firsttext.find("|"); + int intPos = firsttext.tqfind("|"); if(intPos > -1) { qstringCategory = firsttext.left(intPos); qstringMemo = firsttext.mid(intPos + 1); } - QRect rr = r; - QRect rr2 = r; + TQRect rr = r; + TQRect rr2 = r; rr.setX(0); rr.setY(0); rr.setWidth(columnWidth(col)); @@ -157,12 +157,12 @@ void kMyMoneySplitTable::paintCell(QPainter *p, int row, int col, const QRect& r if(row == m_currentRow) { - QBrush backgroundBrush(g.highlight()); + TQBrush backgroundBrush(g.highlight()); textColor = g.highlightedText(); p->fillRect(rr,backgroundBrush); } else { - QBrush backgroundBrush(g.base()); + TQBrush backgroundBrush(g.base()); textColor = g.text(); p->fillRect(rr,backgroundBrush); } @@ -178,17 +178,17 @@ void kMyMoneySplitTable::paintCell(QPainter *p, int row, int col, const QRect& r switch (col) { case 0: // category case 1: // memo - p->drawText(rr2, Qt::AlignLeft | Qt::AlignVCenter, text(row, col)); + p->drawText(rr2, TQt::AlignLeft | TQt::AlignVCenter, text(row, col)); break; case 2: // amount - p->drawText(rr2, Qt::AlignRight | Qt::AlignVCenter,firsttext); + p->drawText(rr2, TQt::AlignRight | TQt::AlignVCenter,firsttext); break; } } -/** Override the QTable member function to avoid display of focus */ -void kMyMoneySplitTable::paintFocus(QPainter * /* p */, const QRect & /*cr*/) +/** Override the TQTable member function to avoid display of focus */ +void kMyMoneySplitTable::paintFocus(TQPainter * /* p */, const TQRect & /*cr*/) { } @@ -198,42 +198,42 @@ void kMyMoneySplitTable::columnWidthChanged(int col) updateCell(i, col); } -/** Override the QTable member function to avoid confusion with our own functionality */ -void kMyMoneySplitTable::endEdit(int /*row*/, int /*col*/, bool /*accept*/, bool /*replace*/ ) +/** Override the TQTable member function to avoid confusion with our own functionality */ +void kMyMoneySplitTable::endEdit(int /*row*/, int /*col*/, bool /*accept*/, bool /*tqreplace*/ ) { } -bool kMyMoneySplitTable::eventFilter(QObject *o, QEvent *e) +bool kMyMoneySplitTable::eventFilter(TQObject *o, TQEvent *e) { // MYMONEYTRACER(tracer); - QKeyEvent *k = static_cast<QKeyEvent *> (e); + TQKeyEvent *k = TQT_TQKEYEVENT (e); bool rc = false; int row = currentRow(); int lines = visibleHeight()/rowHeight(0); - QWidget* w; + TQWidget* w; - if(e->type() == QEvent::KeyPress && !isEditMode()) { + if(e->type() == TQEvent::KeyPress && !isEditMode()) { rc = true; switch(k->key()) { - case Qt::Key_Up: + case TQt::Key_Up: if(row) slotSetFocus(row-1); break; - case Qt::Key_Down: + case TQt::Key_Down: if(row < static_cast<int> (m_transaction.splits().count()-1)) slotSetFocus(row+1); break; - case Qt::Key_Home: + case TQt::Key_Home: slotSetFocus(0); break; - case Qt::Key_End: + case TQt::Key_End: slotSetFocus(m_transaction.splits().count()-1); break; - case Qt::Key_PageUp: + case TQt::Key_PageUp: if(lines) { while(lines-- > 0 && row) row--; @@ -241,7 +241,7 @@ bool kMyMoneySplitTable::eventFilter(QObject *o, QEvent *e) } break; - case Qt::Key_PageDown: + case TQt::Key_PageDown: if(row < static_cast<int> (m_transaction.splits().count()-1)) { while(lines-- > 0 && row < static_cast<int> (m_transaction.splits().count()-1)) row++; @@ -249,12 +249,12 @@ bool kMyMoneySplitTable::eventFilter(QObject *o, QEvent *e) } break; - case Qt::Key_Delete: + case TQt::Key_Delete: slotDeleteSplit(); break; - case Qt::Key_Return: - case Qt::Key_Enter: + case TQt::Key_Return: + case TQt::Key_Enter: if(row < static_cast<int> (m_transaction.splits().count()-1) && KMyMoneyGlobalSettings::enterMovesBetweenFields()) { slotStartEdit(); @@ -262,18 +262,18 @@ bool kMyMoneySplitTable::eventFilter(QObject *o, QEvent *e) emit returnPressed(); break; - case Qt::Key_Escape: + case TQt::Key_Escape: emit escapePressed(); break; - case Qt::Key_F2: + case TQt::Key_F2: slotStartEdit(); break; default: rc = true; KShortcut copySplit(i18n("Duplicate split", "CTRL+c")); - KShortcut newSplit(QKeySequence(Qt::CTRL | Qt::Key_Insert)); + KShortcut newSplit(TQKeySequence(TQt::CTRL | TQt::Key_Insert)); if(copySplit.contains(KKey(k))) { slotDuplicateSplit(); @@ -284,26 +284,26 @@ bool kMyMoneySplitTable::eventFilter(QObject *o, QEvent *e) } else if ( k->text()[ 0 ].isPrint() ) { w = slotStartEdit(); // make sure, the widget receives the key again - QApplication::sendEvent(w, e); + TQApplication::sendEvent(w, e); } break; } - } else if(e->type() == QEvent::KeyPress && isEditMode()) { + } else if(e->type() == TQEvent::KeyPress && isEditMode()) { bool terminate = true; rc = true; switch(k->key()) { // suppress the F2 functionality to start editing in inline edit mode - case Qt::Key_F2: + case TQt::Key_F2: // suppress the cursor movement in inline edit mode - case Qt::Key_Up: - case Qt::Key_Down: - case Qt::Key_PageUp: - case Qt::Key_PageDown: + case TQt::Key_Up: + case TQt::Key_Down: + case TQt::Key_PageUp: + case TQt::Key_PageDown: break; - case Qt::Key_Return: - case Qt::Key_Enter: + case TQt::Key_Return: + case TQt::Key_Enter: // we cannot call the slot directly, as it destroys the caller of // this method :-( So we let the event handler take care of calling // the respective slot using a timeout. For a KLineEdit derived object @@ -322,38 +322,38 @@ bool kMyMoneySplitTable::eventFilter(QObject *o, QEvent *e) // in case we have the 'enter moves focus between fields', we need to simulate // a TAB key when the object 'o' points to the category or memo field. if(KMyMoneyGlobalSettings::enterMovesBetweenFields()) { - if(o == m_editCategory->lineEdit() || o == m_editMemo) { + if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editCategory->lineEdit()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editMemo)) { terminate = false; - QKeyEvent evt(e->type(), - Key_Tab, 0, k->state(), QString::null, + TQKeyEvent evt(e->type(), + Key_Tab, 0, k->state(), TQString(), k->isAutoRepeat(), k->count()); - QApplication::sendEvent( o, &evt ); + TQApplication::sendEvent( o, &evt ); } } if(terminate) { - QTimer::singleShot(0, this, SLOT(slotEndEditKeyboard())); + TQTimer::singleShot(0, this, TQT_SLOT(slotEndEditKeyboard())); } break; - case Qt::Key_Escape: + case TQt::Key_Escape: // we cannot call the slot directly, as it destroys the caller of // this method :-( So we let the event handler take care of calling // the respective slot using a timeout. - QTimer::singleShot(0, this, SLOT(slotCancelEdit())); + TQTimer::singleShot(0, this, TQT_SLOT(slotCancelEdit())); break; default: rc = false; break; } - } else if(e->type() == QEvent::KeyRelease && !isEditMode()) { + } else if(e->type() == TQEvent::KeyRelease && !isEditMode()) { // for some reason, we only see a KeyRelease event of the Menu key // here. In other locations (e.g. Register::eventFilter()) we see // a KeyPress event. Strange. (ipwizard - 2008-05-10) switch(k->key()) { - case Qt::Key_Menu: + case TQt::Key_Menu: // if the very last entry is selected, the delete // operation is not available otherwise it is m_contextMenu->setItemEnabled(m_contextMenuDelete, @@ -361,7 +361,7 @@ bool kMyMoneySplitTable::eventFilter(QObject *o, QEvent *e) m_contextMenu->setItemEnabled(m_contextMenuDuplicate, row < static_cast<int> (m_transaction.splits().count()-1)); - m_contextMenu->exec(QCursor::pos()); + m_contextMenu->exec(TQCursor::pos()); rc = true; break; default: @@ -372,16 +372,16 @@ bool kMyMoneySplitTable::eventFilter(QObject *o, QEvent *e) // if the event has not been processed here, forward it to // the base class implementation if it's not a key event if(rc == false) { - if(e->type() != QEvent::KeyPress - && e->type() != QEvent::KeyRelease) { - rc = QTable::eventFilter(o, e); + if(e->type() != TQEvent::KeyPress + && e->type() != TQEvent::KeyRelease) { + rc = TQTable::eventFilter(o, e); } } return rc; } -void kMyMoneySplitTable::slotSetFocus(int realrow, int /* col */, int button, const QPoint& /* point */) +void kMyMoneySplitTable::slotSetFocus(int realrow, int /* col */, int button, const TQPoint& /* point */) { MYMONEYTRACER(tracer); int row = realrow; @@ -422,22 +422,22 @@ void kMyMoneySplitTable::slotSetFocus(int realrow, int /* col */, int button, co m_contextMenu->setItemEnabled(m_contextMenuDuplicate, row < static_cast<int> (m_transaction.splits().count()-1)); - m_contextMenu->exec(QCursor::pos()); + m_contextMenu->exec(TQCursor::pos()); } } } -void kMyMoneySplitTable::contentsMousePressEvent( QMouseEvent* e ) +void kMyMoneySplitTable::contentsMousePressEvent( TQMouseEvent* e ) { slotSetFocus( rowAt(e->pos().y()), columnAt(e->pos().x()), e->button(), e->pos() ); } -/* turn off QTable behaviour */ -void kMyMoneySplitTable::contentsMouseReleaseEvent( QMouseEvent* /* e */ ) +/* turn off TQTable behaviour */ +void kMyMoneySplitTable::contentsMouseReleaseEvent( TQMouseEvent* /* e */ ) { } -void kMyMoneySplitTable::contentsMouseDoubleClickEvent( QMouseEvent *e ) +void kMyMoneySplitTable::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { MYMONEYTRACER(tracer); @@ -452,7 +452,7 @@ void kMyMoneySplitTable::contentsMouseDoubleClickEvent( QMouseEvent *e ) break; case 2: - editWidget = dynamic_cast<KLineEdit*> (m_editAmount->focusWidget()); + editWidget = dynamic_cast<KLineEdit*> (m_editAmount->tqfocusWidget()); break; default: @@ -463,7 +463,7 @@ void kMyMoneySplitTable::contentsMouseDoubleClickEvent( QMouseEvent *e ) editWidget->selectAll(); // we need to call setFocus on the edit widget from the // main loop again to get the keyboard focus to the widget also - QTimer::singleShot(0, editWidget, SLOT(setFocus())); + TQTimer::singleShot(0, editWidget, TQT_SLOT(setFocus())); } } @@ -474,8 +474,8 @@ void kMyMoneySplitTable::setCurrentCell(int row, int /* col */) if(row > m_maxRows) row = m_maxRows; m_currentRow = row; - QTable::setCurrentCell(row, 0); - QValueList<MyMoneySplit> list = getSplits(m_transaction); + TQTable::setCurrentCell(row, 0); + TQValueList<MyMoneySplit> list = getSplits(m_transaction); if(row < static_cast<int>(list.count())) m_split = list[row]; else @@ -484,16 +484,16 @@ void kMyMoneySplitTable::setCurrentCell(int row, int /* col */) void kMyMoneySplitTable::setNumRows(int irows) { - QTable::setNumRows(irows); + TQTable::setNumRows(irows); // determine row height according to the edit widgets // we use the category widget as the base - QFontMetrics fm( KMyMoneyGlobalSettings::listCellFont() ); + TQFontMetrics fm( KMyMoneyGlobalSettings::listCellFont() ); int height = fm.lineSpacing()+6; #if 0 // recalculate row height hint KMyMoneyCategory cat; - height = QMAX(cat.sizeHint().height(), height); + height = TQMAX(cat.tqsizeHint().height(), height); #endif verticalHeader()->setUpdatesEnabled(false); @@ -517,10 +517,10 @@ void kMyMoneySplitTable::setTransaction(const MyMoneyTransaction& t, const MyMon slotUpdateData(m_transaction); } -const QValueList<MyMoneySplit> kMyMoneySplitTable::getSplits(const MyMoneyTransaction& t) const +const TQValueList<MyMoneySplit> kMyMoneySplitTable::getSplits(const MyMoneyTransaction& t) const { - QValueList<MyMoneySplit> list; - QValueList<MyMoneySplit>::Iterator it; + TQValueList<MyMoneySplit> list; + TQValueList<MyMoneySplit>::Iterator it; // get list of splits list = t.splits(); @@ -541,14 +541,14 @@ void kMyMoneySplitTable::slotUpdateData(const MyMoneyTransaction& t) MYMONEYTRACER(tracer); unsigned long rowCount=0; - QValueList<MyMoneySplit> list = getSplits(t); + TQValueList<MyMoneySplit> list = getSplits(t); updateTransactionTableSize(); // fill the part that is used by transactions - QValueList<MyMoneySplit>::Iterator it; + TQValueList<MyMoneySplit>::Iterator it; kMyMoneyEdit* valfield = new kMyMoneyEdit(); for(it = list.begin(); it != list.end(); ++it) { - QString colText; + TQString colText; MyMoneyMoney value = (*it).value(); if(!(*it).accountId().isEmpty()) { try { @@ -558,17 +558,17 @@ void kMyMoneySplitTable::slotUpdateData(const MyMoneyTransaction& t) delete e; } } - QString amountTxt = value.formatMoney(m_account.fraction()); + TQString amountTxt = value.formatMoney(m_account.fraction()); if(value == MyMoneyMoney::autoCalc) { amountTxt = i18n("will be calculated"); } if(colText.isEmpty() && (*it).memo().isEmpty() && value.isZero()) - amountTxt = QString(); + amountTxt = TQString(); unsigned width = fontMetrics().width(amountTxt); valfield->setMinimumWidth(width); - width = valfield->minimumSizeHint().width(); + width = valfield->tqminimumSizeHint().width(); if(width > m_amountWidth) m_amountWidth = width; @@ -613,7 +613,7 @@ void kMyMoneySplitTable::updateTransactionTableSize(void) m_maxRows = splitCount; } -void kMyMoneySplitTable::resizeEvent(QResizeEvent* /* ev */) +void kMyMoneySplitTable::resizeEvent(TQResizeEvent* /* ev */) { int w = visibleWidth() - m_amountWidth; @@ -628,7 +628,7 @@ void kMyMoneySplitTable::resizeEvent(QResizeEvent* /* ev */) void kMyMoneySplitTable::slotDuplicateSplit(void) { MYMONEYTRACER(tracer); - QValueList<MyMoneySplit> list = getSplits(m_transaction); + TQValueList<MyMoneySplit> list = getSplits(m_transaction); if(m_currentRow < static_cast<int> (list.count())) { MyMoneySplit split = list[m_currentRow]; split.clearId(); @@ -645,7 +645,7 @@ void kMyMoneySplitTable::slotDuplicateSplit(void) void kMyMoneySplitTable::slotDeleteSplit(void) { MYMONEYTRACER(tracer); - QValueList<MyMoneySplit> list = getSplits(m_transaction); + TQValueList<MyMoneySplit> list = getSplits(m_transaction); if(m_currentRow < static_cast<int> (list.count())) { if(KMessageBox::warningContinueCancel (this, i18n("You are about to delete the selected split. " @@ -669,7 +669,7 @@ void kMyMoneySplitTable::slotDeleteSplit(void) } } -QWidget* kMyMoneySplitTable::slotStartEdit(void) +TQWidget* kMyMoneySplitTable::slotStartEdit(void) { MYMONEYTRACER(tracer); return createEditWidgets(); @@ -735,7 +735,7 @@ void kMyMoneySplitTable::endEdit(bool keyBoardDriven) fromValue = s1.value().abs(); // if we had a price info in the beginning, we use it here - if(m_priceInfo.find(cat.currencyId()) != m_priceInfo.end()) { + if(m_priceInfo.tqfind(cat.currencyId()) != m_priceInfo.end()) { toValue = (fromValue * m_priceInfo[cat.currencyId()]).convert(fract); } @@ -760,7 +760,7 @@ void kMyMoneySplitTable::endEdit(bool keyBoardDriven) fract, this, "currencyCalculator"); - if(calc.exec() == QDialog::Rejected) { + if(calc.exec() == TQDialog::Rejected) { return; } else { s1.setShares((s1.value() * calc.price()).convert(fract)); @@ -817,7 +817,7 @@ void kMyMoneySplitTable::destroyEditWidgets(void) { MYMONEYTRACER(tracer); - disconnect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotLoadEditWidgets())); + disconnect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadEditWidgets())); clearCellWidget(m_currentRow, 0); clearCellWidget(m_currentRow, 1); @@ -825,14 +825,14 @@ void kMyMoneySplitTable::destroyEditWidgets(void) clearCellWidget(m_currentRow+1, 0); m_editMode = false; - QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput, 100); + TQApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 100); } -QWidget* kMyMoneySplitTable::createEditWidgets(void) +TQWidget* kMyMoneySplitTable::createEditWidgets(void) { MYMONEYTRACER(tracer); - QFont cellFont = KMyMoneyGlobalSettings::listCellFont(); + TQFont cellFont = KMyMoneyGlobalSettings::listCellFont(); m_tabOrderWidgets.clear(); // create the widgets @@ -843,8 +843,8 @@ QWidget* kMyMoneySplitTable::createEditWidgets(void) m_editCategory = new KMyMoneyCategory(); m_editCategory->setHint(i18n("Category")); m_editCategory->setFont(cellFont); - connect(m_editCategory, SIGNAL(createItem(const QString&, QString&)), this, SIGNAL(createCategory(const QString&, QString&))); - connect(m_editCategory, SIGNAL(objectCreation(bool)), this, SIGNAL(objectCreation(bool))); + connect(m_editCategory, TQT_SIGNAL(createItem(const TQString&, TQString&)), this, TQT_SIGNAL(createCategory(const TQString&, TQString&))); + connect(m_editCategory, TQT_SIGNAL(objectCreation(bool)), this, TQT_SIGNAL(objectCreation(bool))); m_editMemo = new kMyMoneyLineEdit(0, 0, false, AlignLeft|AlignVCenter); m_editMemo->setHint(i18n("Memo")); @@ -852,22 +852,22 @@ QWidget* kMyMoneySplitTable::createEditWidgets(void) // create buttons for the mouse users KIconLoader *il = KGlobal::iconLoader(); - m_registerButtonFrame = new QFrame(this, "buttonFrame"); - QPalette palette = m_registerButtonFrame->palette(); - palette.setColor(QColorGroup::Background, rowBackgroundColor(m_currentRow+1) ); + m_registerButtonFrame = new TQFrame(this, "buttonFrame"); + TQPalette palette = m_registerButtonFrame->palette(); + palette.setColor(TQColorGroup::Background, rowBackgroundColor(m_currentRow+1) ); m_registerButtonFrame->setPalette(palette); - QHBoxLayout* l = new QHBoxLayout(m_registerButtonFrame); - m_registerEnterButton = new KPushButton(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall), QString(), m_registerButtonFrame, "EnterButton"); + TQHBoxLayout* l = new TQHBoxLayout(m_registerButtonFrame); + m_registerEnterButton = new KPushButton(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall), TQString(), m_registerButtonFrame, "EnterButton"); - m_registerCancelButton = new KPushButton(il->loadIcon("button_cancel", KIcon::Small, KIcon::SizeSmall), QString(), m_registerButtonFrame, "CancelButton"); + m_registerCancelButton = new KPushButton(il->loadIcon("button_cancel", KIcon::Small, KIcon::SizeSmall), TQString(), m_registerButtonFrame, "CancelButton"); l->addWidget(m_registerEnterButton); l->addWidget(m_registerCancelButton); l->addStretch(2); - connect(m_registerEnterButton, SIGNAL(clicked()), this, SLOT(slotEndEdit())); - connect(m_registerCancelButton, SIGNAL(clicked()), this, SLOT(slotCancelEdit())); + connect(m_registerEnterButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEndEdit())); + connect(m_registerCancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCancelEdit())); // setup tab order addToTabOrder(m_editCategory); @@ -882,8 +882,8 @@ QWidget* kMyMoneySplitTable::createEditWidgets(void) // check if the transaction is balanced or not. If not, // assign the remainder to the amount. MyMoneyMoney diff; - QValueList<MyMoneySplit> list = m_transaction.splits(); - QValueList<MyMoneySplit>::ConstIterator it_s; + TQValueList<MyMoneySplit> list = m_transaction.splits(); + TQValueList<MyMoneySplit>::ConstIterator it_s; for(it_s = list.begin(); it_s != list.end(); ++it_s) { if(!(*it_s).accountId().isEmpty()) diff += (*it_s).value(); @@ -906,10 +906,10 @@ QWidget* kMyMoneySplitTable::createEditWidgets(void) // load e.g. the category widget with the account list slotLoadEditWidgets(); - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotLoadEditWidgets())); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadEditWidgets())); // setup the keyboard filter for all widgets - for(QWidget* w = m_tabOrderWidgets.first(); w; w = m_tabOrderWidgets.next()) { + for(TQWidget* w = m_tabOrderWidgets.first(); w; w = m_tabOrderWidgets.next()) { w->installEventFilter(this); } @@ -923,7 +923,7 @@ QWidget* kMyMoneySplitTable::createEditWidgets(void) void kMyMoneySplitTable::slotLoadEditWidgets(void) { // reload category widget - QString categoryId = m_editCategory->selectedItem(); + TQString categoryId = m_editCategory->selectedItem(); AccountSet aSet; aSet.addAccountGroup(MyMoneyAccount::Asset); @@ -951,11 +951,11 @@ void kMyMoneySplitTable::slotLoadEditWidgets(void) } -void kMyMoneySplitTable::addToTabOrder(QWidget* w) +void kMyMoneySplitTable::addToTabOrder(TQWidget* w) { if(w) { while(w->focusProxy()) - w = w->focusProxy(); + w = TQT_TQWIDGET(w->focusProxy()); m_tabOrderWidgets.append(w); } } @@ -966,10 +966,10 @@ bool kMyMoneySplitTable::focusNextPrevChild(bool next) bool rc = false; if(m_editCategory) { - QWidget *w = 0; - QWidget *currentWidget; + TQWidget *w = 0; + TQWidget *currentWidget; - m_tabOrderWidgets.find(qApp->focusWidget()); + m_tabOrderWidgets.tqfind(tqApp->tqfocusWidget()); currentWidget = m_tabOrderWidgets.current(); w = next ? m_tabOrderWidgets.next() : m_tabOrderWidgets.prev(); @@ -979,7 +979,7 @@ bool kMyMoneySplitTable::focusNextPrevChild(bool next) } if(w != currentWidget - && ((w->focusPolicy() & TabFocus) == TabFocus) + && ((w->focusPolicy() & TQ_TabFocus) == TQ_TabFocus) && w->isVisible() && w->isEnabled()) { w->setFocus(); rc = true; @@ -989,7 +989,7 @@ bool kMyMoneySplitTable::focusNextPrevChild(bool next) } while(w != currentWidget); } else - rc = QTable::focusNextPrevChild(next); + rc = TQTable::focusNextPrevChild(next); return rc; } diff --git a/kmymoney2/dialogs/kmymoneysplittable.h b/kmymoney2/dialogs/kmymoneysplittable.h index 023660f..477084f 100644 --- a/kmymoney2/dialogs/kmymoneysplittable.h +++ b/kmymoney2/dialogs/kmymoneysplittable.h @@ -26,10 +26,10 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> -#include <qtable.h> -#include <qwidgetlist.h> -#include <qguardedptr.h> +#include <tqwidget.h> +#include <tqtable.h> +#include <tqwidgetlist.h> +#include <tqguardedptr.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -50,15 +50,16 @@ class kMyMoneyEdit; /** * @author Thomas Baumgart */ -class kMyMoneySplitTable : public QTable +class kMyMoneySplitTable : public TQTable { Q_OBJECT + TQ_OBJECT public: - kMyMoneySplitTable(QWidget *parent=0, const char *name=0); + kMyMoneySplitTable(TQWidget *tqparent=0, const char *name=0); virtual ~kMyMoneySplitTable(); - void paintCell(QPainter *p, int row, int col, const QRect& r, bool /*selected*/); - void paintFocus(QPainter *p, const QRect &cr); + void paintCell(TQPainter *p, int row, int col, const TQRect& r, bool /*selected*/); + void paintFocus(TQPainter *p, const TQRect &cr); /** * This method is used to load the widget with the information about @@ -83,19 +84,19 @@ public: * @param t reference to transaction * @return list of splits */ - const QValueList<MyMoneySplit> getSplits(const MyMoneyTransaction& t) const; + const TQValueList<MyMoneySplit> getSplits(const MyMoneyTransaction& t) const; - void setup(const QMap<QString, MyMoneyMoney>& priceInfo); + void setup(const TQMap<TQString, MyMoneyMoney>& priceInfo); protected: - void contentsMousePressEvent( QMouseEvent* e ); - void contentsMouseReleaseEvent( QMouseEvent* e ); - void contentsMouseDoubleClickEvent( QMouseEvent* e ); - bool eventFilter(QObject *o, QEvent *e); - void endEdit(int row, int col, bool accept, bool replace ); - - void resizeEvent(QResizeEvent*); - QWidget* createEditWidgets(void); + void contentsMousePressEvent( TQMouseEvent* e ); + void contentsMouseReleaseEvent( TQMouseEvent* e ); + void contentsMouseDoubleClickEvent( TQMouseEvent* e ); + bool eventFilter(TQObject *o, TQEvent *e); + void endEdit(int row, int col, bool accept, bool tqreplace ); + + void resizeEvent(TQResizeEvent*); + TQWidget* createEditWidgets(void); void destroyEditWidgets(void); /** @@ -108,7 +109,7 @@ protected: * pressed by the user */ virtual bool focusNextPrevChild(bool next); - void addToTabOrder(QWidget* w); + void addToTabOrder(TQWidget* w); /** * convenience function for setCurrentCell(int row, int col) @@ -128,9 +129,9 @@ protected: * This method retuns the background color for a given @p row. * * @param row the row in question - * @return the color as QColor object + * @return the color as TQColor object */ - const QColor rowBackgroundColor(const int row) const; + const TQColor rowBackgroundColor(const int row) const; void endEdit(bool keyboardDriven); @@ -140,7 +141,7 @@ public slots: virtual void setNumRows(int r); - QWidget* slotStartEdit(void); + TQWidget* slotStartEdit(void); void slotEndEdit(void); void slotEndEditKeyboard(void); void slotDeleteSplit(void); @@ -151,7 +152,7 @@ protected slots: virtual void columnWidthChanged(int col); /// move the focus to the selected @p row. - void slotSetFocus(int row, int col = 0, int button = Qt::LeftButton, const QPoint & mousePos = QPoint(0, 0)); + void slotSetFocus(int row, int col = 0, int button = Qt::LeftButton, const TQPoint & mousePos = TQPoint(0, 0)); /** * Calling this slot refills the widget with the data @@ -190,7 +191,7 @@ signals: * @param txt The name of the category to be created * @param id A connected slot should store the id of the created object in this variable */ - void createCategory(const QString& txt, QString& id); + void createCategory(const TQString& txt, TQString& id); /** * Signal is emitted, if any of the widgets enters (@a state equals @a true) @@ -233,32 +234,32 @@ private: * The widget will be created and destroyed dynamically in createInputWidgets() * and destroyInputWidgets(). */ - QGuardedPtr<KMyMoneyCategory> m_editCategory; + TQGuardedPtr<KMyMoneyCategory> m_editCategory; /** * This member contains a pointer to the input widget for the memo. * The widget will be created and destroyed dynamically in createInputWidgets() * and destroyInputWidgets(). */ - QGuardedPtr<kMyMoneyLineEdit> m_editMemo; + TQGuardedPtr<kMyMoneyLineEdit> m_editMemo; /** * This member contains a pointer to the input widget for the amount. * The widget will be created and destroyed dynamically in createInputWidgets() * and destroyInputWidgets(). */ - QGuardedPtr<kMyMoneyEdit> m_editAmount; + TQGuardedPtr<kMyMoneyEdit> m_editAmount; /** * This member keeps the tab order for the above widgets */ - QWidgetList m_tabOrderWidgets; + TQWidgetList m_tabOrderWidgets; - QGuardedPtr<QFrame> m_registerButtonFrame; - QGuardedPtr<KPushButton> m_registerEnterButton; - QGuardedPtr<KPushButton> m_registerCancelButton; + TQGuardedPtr<TQFrame> m_registerButtonFrame; + TQGuardedPtr<KPushButton> m_registerEnterButton; + TQGuardedPtr<KPushButton> m_registerCancelButton; - QMap<QString, MyMoneyMoney> m_priceInfo; + TQMap<TQString, MyMoneyMoney> m_priceInfo; }; #endif diff --git a/kmymoney2/dialogs/knewaccountdlg.cpp b/kmymoney2/dialogs/knewaccountdlg.cpp index f941f2e..fb01aef 100644 --- a/kmymoney2/dialogs/knewaccountdlg.cpp +++ b/kmymoney2/dialogs/knewaccountdlg.cpp @@ -23,19 +23,19 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qpixmap.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qheader.h> -#include <qtooltip.h> -#include <qcheckbox.h> -#include <qtimer.h> -#include <qtabwidget.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qtextedit.h> -#include <qlayout.h> -#include <qtabwidget.h> +#include <tqpixmap.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqheader.h> +#include <tqtooltip.h> +#include <tqcheckbox.h> +#include <tqtimer.h> +#include <tqtabwidget.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqtextedit.h> +#include <tqlayout.h> +#include <tqtabwidget.h> // ---------------------------------------------------------------------------- // KDE Headers @@ -88,24 +88,24 @@ #define KMM_KDCHART_PROPSET_NORMAL_DATA KDCHART_PROPSET_NORMAL_DATA #endif -KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bool categoryEditor, QWidget *parent, const char *name, const QString& title) - : KNewAccountDlgDecl(parent,name,true), +KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bool categoryEditor, TQWidget *tqparent, const char *name, const TQString& title) + : KNewAccountDlgDecl(tqparent,name,true), m_account(account), m_bSelectedParentAccount(false), m_categoryEditor(categoryEditor), m_isEditing(isEditing) { - QString columnName = ( (categoryEditor) ? i18n("Categories") : i18n("Accounts") ); + TQString columnName = ( (categoryEditor) ? i18n("Categories") : i18n("Accounts") ); m_qlistviewParentAccounts->setRootIsDecorated(true); m_qlistviewParentAccounts->setAllColumnsShowFocus(true); m_qlistviewParentAccounts->setSectionHeader(columnName); m_qlistviewParentAccounts->setMultiSelection(false); m_qlistviewParentAccounts->header()->setResizeEnabled(true); - m_qlistviewParentAccounts->setColumnWidthMode(0, QListView::Maximum); + m_qlistviewParentAccounts->setColumnWidthMode(0, TQListView::Maximum); m_qlistviewParentAccounts->setEnabled(false); // never show the horizontal scroll bar - m_qlistviewParentAccounts->setHScrollBarMode(QScrollView::AlwaysOff); + m_qlistviewParentAccounts->setHScrollBarMode(TQScrollView::AlwaysOff); m_subAccountLabel->setText(i18n("Is a sub account")); @@ -135,7 +135,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo if (categoryEditor) { // get rid of the tabs that are not used for categories - QWidget* tab = m_tab->page(m_tab->indexOf(m_institutionTab)); + TQWidget* tab = m_tab->page(m_tab->indexOf(m_institutionTab)); if(tab) m_tab->removePage(tab); tab = m_tab->page(m_tab->indexOf(m_limitsTab)); @@ -178,7 +178,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo else { // get rid of the tabs that are not used for accounts - QWidget* taxtab = m_tab->page(m_tab->indexOf(m_taxTab)); + TQWidget* taxtab = m_tab->page(m_tab->indexOf(m_taxTab)); if (taxtab) { if(m_account.isAssetLiability()) { m_vatCategory->setText(i18n( "VAT account")); @@ -206,7 +206,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo default: // no limit available, so we might get rid of the tab - QWidget* tab = m_tab->page(m_tab->indexOf(m_limitsTab)); + TQWidget* tab = m_tab->page(m_tab->indexOf(m_limitsTab)); if(tab) m_tab->removePage(tab); // don't try to hide the widgets we just wiped @@ -289,7 +289,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo } if(!m_account.openingDate().isValid()) - m_account.setOpeningDate(QDate::currentDate()); + m_account.setOpeningDate(TQDate::tqcurrentDate()); startDateEdit->setDate(m_account.openingDate()); accountNoEdit->setText(account.number()); @@ -334,14 +334,14 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo // Load the institutions // then the accounts - QString institutionName; + TQString institutionName; try { if (m_isEditing && !account.institutionId().isEmpty()) institutionName = file->institution(account.institutionId()).name(); else - institutionName = QString(); + institutionName = TQString(); } catch (MyMoneyException *e) { @@ -349,7 +349,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo delete e; } - initParentWidget(account.parentAccountId(), account.id()); + initParentWidget(account.tqparentAccountId(), account.id()); if(m_account.isInvest()) m_qlistviewParentAccounts->setEnabled(false); @@ -366,44 +366,44 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo cancelButton->setGuiItem(KStdGuiItem::cancel()); createButton->setGuiItem(KStdGuiItem::ok()); - connect(cancelButton, SIGNAL(clicked()), SLOT(reject())); - connect(createButton, SIGNAL(clicked()), this, SLOT(okClicked())); - connect(m_qlistviewParentAccounts, SIGNAL(selectionChanged(QListViewItem*)), - this, SLOT(slotSelectionChanged(QListViewItem*))); - connect(m_qbuttonNew, SIGNAL(clicked()), this, SLOT(slotNewClicked())); - connect(typeCombo, SIGNAL(activated(const QString&)), - this, SLOT(slotAccountTypeChanged(const QString&))); + connect(cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(createButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(okClicked())); + connect(m_qlistviewParentAccounts, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(m_qbuttonNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewClicked())); + connect(typeCombo, TQT_SIGNAL(activated(const TQString&)), + this, TQT_SLOT(slotAccountTypeChanged(const TQString&))); - connect(accountNameEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckFinished())); + connect(accountNameEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckFinished())); - connect(m_vatCategory, SIGNAL(toggled(bool)), this, SLOT(slotVatChanged(bool))); - connect(m_vatAssignment, SIGNAL(toggled(bool)), this, SLOT(slotVatAssignmentChanged(bool))); - connect(m_vatCategory, SIGNAL(toggled(bool)), this, SLOT(slotCheckFinished())); - connect(m_vatAssignment, SIGNAL(toggled(bool)), this, SLOT(slotCheckFinished())); - connect(m_vatRate, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckFinished())); - connect(m_vatAccount, SIGNAL(stateChanged()), this, SLOT(slotCheckFinished())); + connect(m_vatCategory, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotVatChanged(bool))); + connect(m_vatAssignment, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotVatAssignmentChanged(bool))); + connect(m_vatCategory, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCheckFinished())); + connect(m_vatAssignment, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCheckFinished())); + connect(m_vatRate, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckFinished())); + connect(m_vatAccount, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(slotCheckFinished())); - connect(m_minBalanceEarlyEdit, SIGNAL(valueChanged(const QString&)), this, SLOT(slotAdjustMinBalanceAbsoluteEdit(const QString&))); - connect(m_minBalanceAbsoluteEdit, SIGNAL(valueChanged(const QString&)), this, SLOT(slotAdjustMinBalanceEarlyEdit(const QString&))); - connect(m_maxCreditEarlyEdit, SIGNAL(valueChanged(const QString&)), this, SLOT(slotAdjustMaxCreditAbsoluteEdit(const QString&))); - connect(m_maxCreditAbsoluteEdit, SIGNAL(valueChanged(const QString&)), this, SLOT(slotAdjustMaxCreditEarlyEdit(const QString&))); + connect(m_minBalanceEarlyEdit, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotAdjustMinBalanceAbsoluteEdit(const TQString&))); + connect(m_minBalanceAbsoluteEdit, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotAdjustMinBalanceEarlyEdit(const TQString&))); + connect(m_maxCreditEarlyEdit, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotAdjustMaxCreditAbsoluteEdit(const TQString&))); + connect(m_maxCreditAbsoluteEdit, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotAdjustMaxCreditEarlyEdit(const TQString&))); - connect(m_qcomboboxInstitutions, SIGNAL(activated(const QString&)), this, SLOT(slotLoadInstitutions(const QString&))); + connect(m_qcomboboxInstitutions, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotLoadInstitutions(const TQString&))); m_vatCategory->setChecked(false); m_vatAssignment->setChecked(false); - // make sure our account does not have an id and no parent assigned - // and certainly no children in case we create a new account + // make sure our account does not have an id and no tqparent assigned + // and certainly no tqchildren in case we create a new account if(!m_isEditing) { m_account.clearId(); - m_account.setParentAccountId(QString()); - QStringList::ConstIterator it; + m_account.setParentAccountId(TQString()); + TQStringList::ConstIterator it; while((it = m_account.accountList().begin()) != m_account.accountList().end()) m_account.removeAccountId(*it); if(m_parentItem == 0) { - // force loading of initial parent + // force loading of initial tqparent m_account.setAccountType(MyMoneyAccount::UnknownAccountType); MyMoneyAccount::_accountTypeE type = account.accountType(); if(type == MyMoneyAccount::UnknownAccountType) @@ -416,7 +416,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo m_vatRate->setValue(MyMoneyMoney(m_account.value("VatRate"))*MyMoneyMoney(100,1)); } else { if(!m_account.value("VatAccount").isEmpty()) { - QString accId = m_account.value("VatAccount").latin1(); + TQString accId = m_account.value("VatAccount").latin1(); try { // make sure account exists MyMoneyFile::instance()->account(accId); @@ -435,14 +435,14 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo slotVatAssignmentChanged(m_vatAssignment->isChecked()); slotCheckFinished(); - kMandatoryFieldGroup* requiredFields = new kMandatoryFieldGroup (this); + kMandatoryFieldGroup* requiredFields = new kMandatoryFieldGroup (TQT_TQOBJECT(this)); requiredFields->setOkButton(createButton); // button to be enabled when all fields present requiredFields->add(accountNameEdit); // using a timeout is the only way, I got the 'ensureItemVisible' // working when creating the dialog. I assume, this // has something to do with the delayed update of the display somehow. - QTimer::singleShot(50, this, SLOT(timerDone())); + TQTimer::singleShot(50, this, TQT_SLOT(timerDone())); } void KNewAccountDlg::timerDone(void) @@ -451,7 +451,7 @@ void KNewAccountDlg::timerDone(void) if(m_parentItem) m_qlistviewParentAccounts->ensureItemVisible(m_parentItem); // KNewAccountDlgDecl::resizeEvent(0); m_qlistviewParentAccounts->setColumnWidth(m_qlistviewParentAccounts->nameColumn(), m_qlistviewParentAccounts->visibleWidth()); - m_qlistviewParentAccounts->repaintContents(false); + m_qlistviewParentAccounts->tqrepaintContents(false); } void KNewAccountDlg::setOpeningBalance(const MyMoneyMoney& balance) @@ -468,7 +468,7 @@ void KNewAccountDlg::okClicked() { MyMoneyFile* file = MyMoneyFile::instance(); - QString accountNameText = accountNameEdit->text(); + TQString accountNameText = accountNameEdit->text(); if (accountNameText.isEmpty()) { KMessageBox::error(this, i18n("You have not specified a name.\nPlease fill in this field.")); @@ -476,24 +476,24 @@ void KNewAccountDlg::okClicked() return; } - MyMoneyAccount parent = parentAccount(); - if (parent.name().length() == 0) + MyMoneyAccount tqparent = tqparentAccount(); + if (tqparent.name().length() == 0) { - KMessageBox::error(this, i18n("Please select a parent account.")); + KMessageBox::error(this, i18n("Please select a tqparent account.")); return; } if (!m_categoryEditor) { - QString institutionNameText = m_qcomboboxInstitutions->currentText(); + TQString institutionNameText = m_qcomboboxInstitutions->currentText(); if (institutionNameText != i18n("<No Institution>")) { try { MyMoneyFile *file = MyMoneyFile::instance(); - QValueList<MyMoneyInstitution> list = file->institutionList(); - QValueList<MyMoneyInstitution>::ConstIterator institutionIterator; + TQValueList<MyMoneyInstitution> list = file->institutionList(); + TQValueList<MyMoneyInstitution>::ConstIterator institutionIterator; for (institutionIterator = list.begin(); institutionIterator != list.end(); ++institutionIterator) { if ((*institutionIterator).name() == institutionNameText) @@ -508,7 +508,7 @@ void KNewAccountDlg::okClicked() } else { - m_account.setInstitutionId(QString()); + m_account.setInstitutionId(TQString()); } } @@ -532,16 +532,16 @@ void KNewAccountDlg::okClicked() storeKVP("lastNumberUsed", m_lastCheckNumberUsed); // delete a previous version of the minimumbalance information - storeKVP("minimumBalance", QString(), QString()); + storeKVP("minimumBalance", TQString(), TQString()); MyMoneyAccount::accountTypeE acctype; if (!m_categoryEditor) { acctype = KMyMoneyUtils::stringToAccountType(typeCombo->currentText()); - // If it's a loan, check if the parent is asset or liability. In + // If it's a loan, check if the tqparent is asset or liability. In // case of asset, we change the account type to be AssetLoan if(acctype == MyMoneyAccount::Loan - && parent.accountGroup() == MyMoneyAccount::Asset) + && tqparent.accountGroup() == MyMoneyAccount::Asset) acctype = MyMoneyAccount::AssetLoan; #if 0 @@ -549,22 +549,22 @@ void KNewAccountDlg::okClicked() // we don't need this check anymore. if(!file->nameToAccount(accountNameText).isEmpty() && (file->nameToAccount(accountNameText) != m_account.id())) { - KMessageBox::error(this, QString("<qt>")+i18n("An account named <b>%1</b> already exists. You cannot create a second account with the same name.").arg(accountNameText)+QString("</qt>")); + KMessageBox::error(this, TQString("<qt>")+i18n("An account named <b>%1</b> already exists. You cannot create a second account with the same name.").tqarg(accountNameText)+TQString("</qt>")); return; } #endif } else { - acctype = parent.accountGroup(); - QString newName; - if(!MyMoneyFile::instance()->isStandardAccount(parent.id())) { - newName = MyMoneyFile::instance()->accountToCategory(parent.id()) + MyMoneyFile::AccountSeperator; + acctype = tqparent.accountGroup(); + TQString newName; + if(!MyMoneyFile::instance()->isStandardAccount(tqparent.id())) { + newName = MyMoneyFile::instance()->accountToCategory(tqparent.id()) + MyMoneyFile::AccountSeperator; } newName += accountNameText; if(!file->categoryToAccount(newName, acctype).isEmpty() && (file->categoryToAccount(newName, acctype) != m_account.id())) { - KMessageBox::error(this, QString("<qt>")+i18n("A category named <b>%1</b> already exists. You cannot create a second category with the same name.").arg(newName)+QString("</qt>")); + KMessageBox::error(this, TQString("<qt>")+i18n("A category named <b>%1</b> already exists. You cannot create a second category with the same name.").tqarg(newName)+TQString("</qt>")); return; } } @@ -619,7 +619,7 @@ void KNewAccountDlg::okClicked() accept(); } -void KNewAccountDlg::loadKVP(const QString& key, kMyMoneyEdit* widget) +void KNewAccountDlg::loadKVP(const TQString& key, kMyMoneyEdit* widget) { if(!widget) return; @@ -631,7 +631,7 @@ void KNewAccountDlg::loadKVP(const QString& key, kMyMoneyEdit* widget) } } -void KNewAccountDlg::loadKVP(const QString& key, KLineEdit* widget) +void KNewAccountDlg::loadKVP(const TQString& key, KLineEdit* widget) { if(!widget) return; @@ -639,7 +639,7 @@ void KNewAccountDlg::loadKVP(const QString& key, KLineEdit* widget) widget->setText(m_account.value(key)); } -void KNewAccountDlg::storeKVP(const QString& key, const QString& text, const QString& value) +void KNewAccountDlg::storeKVP(const TQString& key, const TQString& text, const TQString& value) { if(text.isEmpty()) m_account.deletePair(key); @@ -647,12 +647,12 @@ void KNewAccountDlg::storeKVP(const QString& key, const QString& text, const QSt m_account.setValue(key, value); } -void KNewAccountDlg::storeKVP(const QString& key, kMyMoneyEdit* widget) +void KNewAccountDlg::storeKVP(const TQString& key, kMyMoneyEdit* widget) { storeKVP(key, widget->lineedit()->text(), widget->text()); } -void KNewAccountDlg::storeKVP(const QString& key, KLineEdit* widget) +void KNewAccountDlg::storeKVP(const TQString& key, KLineEdit* widget) { storeKVP(key, widget->text(), widget->text()); } @@ -669,14 +669,14 @@ const MyMoneyAccount& KNewAccountDlg::account(void) break; case 1: case 2: - m_account.setValue("priceMode", QString("%1").arg(m_priceMode->currentItem())); + m_account.setValue("priceMode", TQString("%1").tqarg(m_priceMode->currentItem())); break; } return m_account; } -const MyMoneyAccount& KNewAccountDlg::parentAccount(void) +const MyMoneyAccount& KNewAccountDlg::tqparentAccount(void) { if (!m_bSelectedParentAccount) { @@ -710,7 +710,7 @@ const MyMoneyAccount& KNewAccountDlg::parentAccount(void) return m_parentAccount; } -void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId) +void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accountId) { MyMoneyFile *file = MyMoneyFile::instance(); @@ -723,18 +723,18 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId m_parentItem = 0; m_accountItem = 0; - // Determine the parent account + // Determine the tqparent account try { - m_parentAccount = file->account(parentId); + m_parentAccount = file->account(tqparentId); } catch (MyMoneyException *e) { m_bSelectedParentAccount = false; m_parentAccount = MyMoneyAccount(); if(m_account.accountType() != MyMoneyAccount::UnknownAccountType) { - parentAccount(); - parentId = m_parentAccount.id(); + tqparentAccount(); + tqparentId = m_parentAccount.id(); } delete e; } @@ -748,7 +748,7 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId m_qlistviewParentAccounts->clear(); - // Now scan all 4 account roots to load the list and mark the parent + // Now scan all 4 account roots to load the list and mark the tqparent try { if (!m_categoryEditor) @@ -759,15 +759,15 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId if(m_parentAccount.id().isEmpty()) { m_parentAccount = assetAccount; - parentId = m_parentAccount.id(); + tqparentId = m_parentAccount.id(); } - if (parentId == assetAccount.id()) + if (tqparentId == assetAccount.id()) m_parentItem = assetTopLevelAccount; assetTopLevelAccount->setOpen(true); - for ( QStringList::ConstIterator it = assetAccount.accountList().begin(); + for ( TQStringList::ConstIterator it = assetAccount.accountList().begin(); it != assetAccount.accountList().end(); ++it ) { @@ -777,7 +777,7 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId KMyMoneyAccountTreeBaseItem *accountItem = new KMyMoneyAccountTreeItem(assetTopLevelAccount, acc); - if(parentId == acc.id()) { + if(tqparentId == acc.id()) { m_parentItem = accountItem; } else if(accountId == acc.id()) { if(m_isEditing) @@ -785,10 +785,10 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId m_accountItem = accountItem; } - QStringList subAccounts = acc.accountList(); + TQStringList subAccounts = acc.accountList(); if (subAccounts.count() >= 1) { - showSubAccounts(subAccounts, accountItem, parentId, acc.id()); + showSubAccounts(subAccounts, accountItem, tqparentId, acc.id()); } } } @@ -799,15 +799,15 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId if(m_parentAccount.id().isEmpty()) { m_parentAccount = liabilityAccount; - parentId = m_parentAccount.id(); + tqparentId = m_parentAccount.id(); } - if (parentId == liabilityAccount.id()) + if (tqparentId == liabilityAccount.id()) m_parentItem = liabilityTopLevelAccount; liabilityTopLevelAccount->setOpen(true); - for ( QStringList::ConstIterator it = liabilityAccount.accountList().begin(); + for ( TQStringList::ConstIterator it = liabilityAccount.accountList().begin(); it != liabilityAccount.accountList().end(); ++it ) { @@ -817,7 +817,7 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId KMyMoneyAccountTreeBaseItem *accountItem = new KMyMoneyAccountTreeItem(liabilityTopLevelAccount, acc); - if(parentId == acc.id()) { + if(tqparentId == acc.id()) { m_parentItem = accountItem; } else if(accountId == acc.id()) { if(m_isEditing) @@ -825,10 +825,10 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId m_accountItem = accountItem; } - QStringList subAccounts = acc.accountList(); + TQStringList subAccounts = acc.accountList(); if (subAccounts.count() >= 1) { - showSubAccounts(subAccounts, accountItem, parentId, acc.id()); + showSubAccounts(subAccounts, accountItem, tqparentId, acc.id()); } } } @@ -842,23 +842,23 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId if(m_parentAccount.id().isEmpty()) { m_parentAccount = incomeAccount; - parentId = m_parentAccount.id(); + tqparentId = m_parentAccount.id(); } - if (parentId == incomeAccount.id()) + if (tqparentId == incomeAccount.id()) m_parentItem = incomeTopLevelAccount; incomeTopLevelAccount->setOpen(true); - for ( QStringList::ConstIterator it = incomeAccount.accountList().begin(); + for ( TQStringList::ConstIterator it = incomeAccount.accountList().begin(); it != incomeAccount.accountList().end(); ++it ) { KMyMoneyAccountTreeBaseItem *accountItem = new KMyMoneyAccountTreeItem(incomeTopLevelAccount, file->account(*it)); - QString id = file->account(*it).id(); - if(parentId == id) { + TQString id = file->account(*it).id(); + if(tqparentId == id) { m_parentItem = accountItem; } else if(accountId == id) { if(m_isEditing) @@ -866,10 +866,10 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId m_accountItem = accountItem; } - QStringList subAccounts = file->account(*it).accountList(); + TQStringList subAccounts = file->account(*it).accountList(); if (subAccounts.count() >= 1) { - showSubAccounts(subAccounts, accountItem, parentId, accountId); + showSubAccounts(subAccounts, accountItem, tqparentId, accountId); } } } @@ -881,23 +881,23 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId if(m_parentAccount.id().isEmpty()) { m_parentAccount = expenseAccount; - parentId = m_parentAccount.id(); + tqparentId = m_parentAccount.id(); } - if (parentId == expenseAccount.id()) + if (tqparentId == expenseAccount.id()) m_parentItem = expenseTopLevelAccount; expenseTopLevelAccount->setOpen(true); - for ( QStringList::ConstIterator it = expenseAccount.accountList().begin(); + for ( TQStringList::ConstIterator it = expenseAccount.accountList().begin(); it != expenseAccount.accountList().end(); ++it ) { KMyMoneyAccountTreeBaseItem *accountItem = new KMyMoneyAccountTreeItem(expenseTopLevelAccount, file->account(*it)); - QString id = file->account(*it).id(); - if(parentId == id) { + TQString id = file->account(*it).id(); + if(tqparentId == id) { m_parentItem = accountItem; } else if(accountId == id) { if(m_isEditing) @@ -905,10 +905,10 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId m_accountItem = accountItem; } - QStringList subAccounts = file->account(*it).accountList(); + TQStringList subAccounts = file->account(*it).accountList(); if (subAccounts.count() >= 1) { - showSubAccounts(subAccounts, accountItem, parentId, accountId); + showSubAccounts(subAccounts, accountItem, tqparentId, accountId); } } } @@ -924,7 +924,7 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId if (m_parentItem) { - m_subAccountLabel->setText(i18n("Is a sub account of %1").arg(m_parentAccount.name())); + m_subAccountLabel->setText(i18n("Is a sub account of %1").tqarg(m_parentAccount.name())); m_parentItem->setOpen(true); m_qlistviewParentAccounts->setSelected(m_parentItem, true); } @@ -932,18 +932,18 @@ void KNewAccountDlg::initParentWidget(QString parentId, const QString& accountId m_qlistviewParentAccounts->setEnabled(true); } -void KNewAccountDlg::showSubAccounts(QStringList accounts, KMyMoneyAccountTreeBaseItem *parentItem, - const QString& parentId, const QString& accountId) +void KNewAccountDlg::showSubAccounts(TQStringList accounts, KMyMoneyAccountTreeBaseItem *tqparentItem, + const TQString& tqparentId, const TQString& accountId) { MyMoneyFile *file = MyMoneyFile::instance(); - for ( QStringList::ConstIterator it = accounts.begin(); it != accounts.end(); ++it ) + for ( TQStringList::ConstIterator it = accounts.begin(); it != accounts.end(); ++it ) { - KMyMoneyAccountTreeBaseItem *accountItem = new KMyMoneyAccountTreeItem(parentItem, + KMyMoneyAccountTreeBaseItem *accountItem = new KMyMoneyAccountTreeItem(tqparentItem, file->account(*it)); - QString id = file->account(*it).id(); - if(parentId == id) { + TQString id = file->account(*it).id(); + if(tqparentId == id) { m_parentItem = accountItem; } else if(accountId == id) { if(m_isEditing) @@ -951,15 +951,15 @@ void KNewAccountDlg::showSubAccounts(QStringList accounts, KMyMoneyAccountTreeBa m_accountItem = accountItem; } - QStringList subAccounts = file->account(*it).accountList(); + TQStringList subAccounts = file->account(*it).accountList(); if (subAccounts.count() >= 1) { - showSubAccounts(subAccounts, accountItem, parentId, accountId); + showSubAccounts(subAccounts, accountItem, tqparentId, accountId); } } } -void KNewAccountDlg::resizeEvent(QResizeEvent* e) +void KNewAccountDlg::resizeEvent(TQResizeEvent* e) { m_qlistviewParentAccounts->setColumnWidth(0, m_qlistviewParentAccounts->width()); @@ -967,7 +967,7 @@ void KNewAccountDlg::resizeEvent(QResizeEvent* e) KNewAccountDlgDecl::resizeEvent(e); } -void KNewAccountDlg::slotSelectionChanged(QListViewItem *item) +void KNewAccountDlg::slotSelectionChanged(TQListViewItem *item) { KMyMoneyAccountTreeBaseItem *accountItem = dynamic_cast<KMyMoneyAccountTreeBaseItem*>(item); try @@ -976,7 +976,7 @@ void KNewAccountDlg::slotSelectionChanged(QListViewItem *item) //qDebug("Selected account id: %s", accountItem->accountID().data()); m_parentAccount = file->account(accountItem->id()); - m_subAccountLabel->setText(i18n("Is a sub account of %1").arg(m_parentAccount.name())); + m_subAccountLabel->setText(i18n("Is a sub account of %1").tqarg(m_parentAccount.name())); if(m_qlistviewParentAccounts->isEnabled()) { m_bSelectedParentAccount = true; } @@ -990,13 +990,13 @@ void KNewAccountDlg::slotSelectionChanged(QListViewItem *item) void KNewAccountDlg::loadVatAccounts(void) { - QValueList<MyMoneyAccount> list; + TQValueList<MyMoneyAccount> list; MyMoneyFile::instance()->accountList(list); - QValueList<MyMoneyAccount>::Iterator it; - QStringList loadListExpense; - QStringList loadListIncome; - QStringList loadListAsset; - QStringList loadListLiability; + TQValueList<MyMoneyAccount>::Iterator it; + TQStringList loadListExpense; + TQStringList loadListIncome; + TQStringList loadListAsset; + TQStringList loadListLiability; for(it = list.begin(); it != list.end(); ++it) { if(!(*it).value("VatRate").isEmpty()) { if((*it).accountType() == MyMoneyAccount::Expense) @@ -1020,11 +1020,11 @@ void KNewAccountDlg::loadVatAccounts(void) vatSet.load(m_vatAccount, i18n("Expense"), loadListExpense, false); } -void KNewAccountDlg::slotLoadInstitutions(const QString& name) +void KNewAccountDlg::slotLoadInstitutions(const TQString& name) { int id=-1, counter=0; m_qcomboboxInstitutions->clear(); - QString bic; + TQString bic; // Are we forcing the user to use institutions? m_qcomboboxInstitutions->insertItem(i18n("<No Institution>")); m_bicValue->setText(" "); @@ -1034,8 +1034,8 @@ void KNewAccountDlg::slotLoadInstitutions(const QString& name) { MyMoneyFile *file = MyMoneyFile::instance(); - QValueList<MyMoneyInstitution> list = file->institutionList(); - QValueList<MyMoneyInstitution>::ConstIterator institutionIterator; + TQValueList<MyMoneyInstitution> list = file->institutionList(); + TQValueList<MyMoneyInstitution>::ConstIterator institutionIterator; for (institutionIterator = list.begin(), counter=1; institutionIterator != list.end(); ++institutionIterator, counter++) { if ((*institutionIterator).name() == name) { @@ -1084,7 +1084,7 @@ void KNewAccountDlg::slotNewClicked() } } -void KNewAccountDlg::slotAccountTypeChanged(const QString& typeStr) +void KNewAccountDlg::slotAccountTypeChanged(const TQString& typeStr) { MyMoneyAccount::accountTypeE type; MyMoneyAccount::accountTypeE oldType; @@ -1094,25 +1094,25 @@ void KNewAccountDlg::slotAccountTypeChanged(const QString& typeStr) try { oldType = m_account.accountType(); if(oldType != type) { - QString parentId; + TQString tqparentId; switch(MyMoneyAccount::accountGroup(type)) { case MyMoneyAccount::Asset: - parentId = file->asset().id(); + tqparentId = file->asset().id(); break; case MyMoneyAccount::Liability: - parentId = file->liability().id(); + tqparentId = file->liability().id(); break; case MyMoneyAccount::Expense: - parentId = file->expense().id(); + tqparentId = file->expense().id(); break; case MyMoneyAccount::Income: - parentId = file->income().id(); + tqparentId = file->income().id(); break; default: qWarning("Unknown account group in KNewAccountDlg::slotAccountTypeChanged()"); break; } - initParentWidget(parentId, QString()); + initParentWidget(tqparentId, TQString()); m_account.setAccountType(type); } } catch(MyMoneyException *e) { @@ -1176,30 +1176,30 @@ void KNewAccountDlg::adjustEditWidgets(kMyMoneyEdit* dst, kMyMoneyEdit* src, cha } } -void KNewAccountDlg::slotAdjustMinBalanceAbsoluteEdit(const QString&) +void KNewAccountDlg::slotAdjustMinBalanceAbsoluteEdit(const TQString&) { adjustEditWidgets(m_minBalanceAbsoluteEdit, m_minBalanceEarlyEdit, '<', -1); } -void KNewAccountDlg::slotAdjustMinBalanceEarlyEdit(const QString&) +void KNewAccountDlg::slotAdjustMinBalanceEarlyEdit(const TQString&) { adjustEditWidgets(m_minBalanceEarlyEdit, m_minBalanceAbsoluteEdit, '>', -1); } -void KNewAccountDlg::slotAdjustMaxCreditAbsoluteEdit(const QString&) +void KNewAccountDlg::slotAdjustMaxCreditAbsoluteEdit(const TQString&) { adjustEditWidgets(m_maxCreditAbsoluteEdit, m_maxCreditEarlyEdit, '>', 1); } -void KNewAccountDlg::slotAdjustMaxCreditEarlyEdit(const QString&) +void KNewAccountDlg::slotAdjustMaxCreditEarlyEdit(const TQString&) { adjustEditWidgets(m_maxCreditEarlyEdit, m_maxCreditAbsoluteEdit, '<', 1); } -void KNewAccountDlg::addTab(QWidget* w, const QString& name) +void KNewAccountDlg::addTab(TQWidget* w, const TQString& name) { if(w) { - w->reparent(m_tab, QPoint(0,0)); + w->reparent(m_tab, TQPoint(0,0)); m_tab->addTab(w, name); } } diff --git a/kmymoney2/dialogs/knewaccountdlg.h b/kmymoney2/dialogs/knewaccountdlg.h index ee09158..5b6e481 100644 --- a/kmymoney2/dialogs/knewaccountdlg.h +++ b/kmymoney2/dialogs/knewaccountdlg.h @@ -48,6 +48,7 @@ namespace reports { class KNewAccountDlg : public KNewAccountDlgDecl { Q_OBJECT + TQ_OBJECT private: MyMoneyAccount m_account; @@ -64,14 +65,14 @@ private: int m_idPropMaxCredit; int m_idPropMinBalance; - void initParentWidget(QString parentId, const QString& accountId); - void showSubAccounts(QStringList accounts, KMyMoneyAccountTreeBaseItem *parentItem, const QString& parentId, const QString& accountId); + void initParentWidget(TQString tqparentId, const TQString& accountId); + void showSubAccounts(TQStringList accounts, KMyMoneyAccountTreeBaseItem *tqparentItem, const TQString& tqparentId, const TQString& accountId); void loadVatAccounts(void); - void storeKVP(const QString& key, kMyMoneyEdit* widget); - void storeKVP(const QString& key, KLineEdit* widget); - void storeKVP(const QString& key, const QString& text, const QString& value); - void loadKVP(const QString& key, kMyMoneyEdit* widget); - void loadKVP(const QString& key, KLineEdit* widget); + void storeKVP(const TQString& key, kMyMoneyEdit* widget); + void storeKVP(const TQString& key, KLineEdit* widget); + void storeKVP(const TQString& key, const TQString& text, const TQString& value); + void loadKVP(const TQString& key, kMyMoneyEdit* widget); + void loadKVP(const TQString& key, KLineEdit* widget); public: /** @@ -80,17 +81,17 @@ public: * apply and will be handled by the dialog. * * @param account The original data to be used to create the account. In case - * of @p isEditing is false, the account id, the parent account id + * of @p isEditing is false, the account id, the tqparent account id * and the list of all child accounts will be cleared. * @param isEditing If @p false, rules for new account creation apply. * If @p true, rules for account editing apply * @param categoryEditor If @p false, rules for asset/liability accounts apply. * If @p true, rules for income/expense account apply. - * @param parent Pointer to parent object (passed to QDialog). Default is 0. - * @param name Name of the object (passed to QDialog). Default is 0. - * @param title Caption of the object (passed to QDialog). Default is empty string. + * @param tqparent Pointer to tqparent object (passed to TQDialog). Default is 0. + * @param name Name of the object (passed to TQDialog). Default is 0. + * @param title Caption of the object (passed to TQDialog). Default is empty string. */ - KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bool categoryEditor, QWidget *parent=0, const char *name=0, const QString& title=QString::null); + KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bool categoryEditor, TQWidget *tqparent=0, const char *name=0, const TQString& title=TQString()); /** * This method returns the edited account object. @@ -98,9 +99,9 @@ public: const MyMoneyAccount& account(void); /** - * This method returns the parent account of the edited account object. + * This method returns the tqparent account of the edited account object. */ - const MyMoneyAccount& parentAccount(void); + const MyMoneyAccount& tqparentAccount(void); void setOpeningBalance(const MyMoneyMoney& balance); @@ -113,26 +114,26 @@ public: * This tab is usually defined by a plugin (eg. online banking). If @a w is * zero, this is a NOP. @a name is used as the text to be placed on the tab. */ - void addTab(QWidget* w, const QString& name); + void addTab(TQWidget* w, const TQString& name); protected: - void resizeEvent(QResizeEvent* e); - void displayOnlineBankingStatus(void); + void resizeEvent(TQResizeEvent* e); + void displayOnlineBankingtqStatus(void); void adjustEditWidgets(kMyMoneyEdit* dst, kMyMoneyEdit* src, char mode, int corr); protected slots: void okClicked(); - void slotSelectionChanged(QListViewItem *item); - void slotAccountTypeChanged(const QString& type); + void slotSelectionChanged(TQListViewItem *item); + void slotAccountTypeChanged(const TQString& type); void slotVatChanged(bool); void slotVatAssignmentChanged(bool); void slotNewClicked(void); void slotCheckFinished(void); - void slotLoadInstitutions(const QString&); - void slotAdjustMinBalanceAbsoluteEdit(const QString&); - void slotAdjustMinBalanceEarlyEdit(const QString&); - void slotAdjustMaxCreditAbsoluteEdit(const QString&); - void slotAdjustMaxCreditEarlyEdit(const QString&); + void slotLoadInstitutions(const TQString&); + void slotAdjustMinBalanceAbsoluteEdit(const TQString&); + void slotAdjustMinBalanceEarlyEdit(const TQString&); + void slotAdjustMaxCreditAbsoluteEdit(const TQString&); + void slotAdjustMaxCreditEarlyEdit(const TQString&); private slots: void timerDone(void); diff --git a/kmymoney2/dialogs/knewaccountdlgdecl.ui b/kmymoney2/dialogs/knewaccountdlgdecl.ui index 6f6357e..5d374e7 100644 --- a/kmymoney2/dialogs/knewaccountdlgdecl.ui +++ b/kmymoney2/dialogs/knewaccountdlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KNewAccountDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>kNewAccountDlgDecl</cstring> </property> @@ -22,11 +22,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>m_tab</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_generalTab</cstring> </property> @@ -37,25 +37,25 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>60</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -71,14 +71,14 @@ <string>Name:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>accountNameEdit</cstring> </property> </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -100,7 +100,7 @@ <cstring>m_currency</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>m_currencyText</cstring> </property> @@ -108,7 +108,7 @@ <string>Currency:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>typeCombo</cstring> </property> @@ -124,7 +124,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -132,11 +132,11 @@ <string>Type:</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -157,7 +157,7 @@ <cstring>startDateEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -172,7 +172,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -183,17 +183,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> @@ -214,7 +214,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>20</height> @@ -223,7 +223,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -231,17 +231,17 @@ <string>Last check number:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -250,26 +250,26 @@ <property name="text"> <string>Notes:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> - <widget class="QTextEdit" row="1" column="1"> + <widget class="TQTextEdit" row="1" column="1"> <property name="name"> <cstring>descriptionEdit</cstring> </property> </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_qcheckboxNoVat</cstring> </property> @@ -277,15 +277,15 @@ <string>No auto-VAT-assignment</string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5</cstring> </property> @@ -311,7 +311,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_qcheckboxPreferred</cstring> </property> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -342,7 +342,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_institutionTab</cstring> </property> @@ -353,7 +353,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_institutionBox</cstring> </property> @@ -364,7 +364,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -378,12 +378,12 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_qcomboboxInstitutions</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_qbuttonNew</cstring> </property> @@ -401,9 +401,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <grid> <property name="name"> @@ -414,17 +414,17 @@ <cstring>accountNoEdit</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>60</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -434,7 +434,7 @@ <string>Number:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -447,7 +447,7 @@ <cstring>ibanEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -455,7 +455,7 @@ <string>IBAN</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_bicValue</cstring> </property> @@ -477,7 +477,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>30</height> @@ -486,7 +486,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_hiearchyTab</cstring> </property> @@ -497,7 +497,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_subAccountLabel</cstring> </property> @@ -513,7 +513,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_limitsTab</cstring> </property> @@ -532,15 +532,15 @@ <string>This page allows to setup certain limits. KMyMoney will warn you when the account balance reaches a limit.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -556,7 +556,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -564,7 +564,7 @@ <string>Absolute limit</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>m_maxCreditLabel</cstring> </property> @@ -596,7 +596,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>m_minBalanceLabel</cstring> </property> @@ -618,7 +618,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -638,7 +638,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -647,7 +647,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_taxTab</cstring> </property> @@ -658,7 +658,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -669,15 +669,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout34</cstring> + <cstring>tqlayout34</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_vatCategory</cstring> </property> @@ -685,7 +685,7 @@ <string>VAT category</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_vatCategoryFrame</cstring> </property> @@ -702,7 +702,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -710,9 +710,9 @@ <string>VAT percentage</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout33</cstring> + <cstring>tqlayout33</cstring> </property> <hbox> <property name="name"> @@ -733,7 +733,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -754,7 +754,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -763,7 +763,7 @@ </spacer> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_vatAssignmentFrame</cstring> </property> @@ -780,15 +780,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_vatAssignment</cstring> </property> @@ -803,25 +803,25 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_amountGroup</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -840,7 +840,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_grossAmount</cstring> </property> @@ -851,7 +851,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_netAmount</cstring> </property> @@ -871,7 +871,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -884,7 +884,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_qcheckboxTax</cstring> </property> @@ -909,7 +909,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout29</cstring> </property> @@ -933,7 +933,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>422</width> <height>0</height> @@ -1040,5 +1040,10 @@ <tabstop>createButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/knewbankdlg.cpp b/kmymoney2/dialogs/knewbankdlg.cpp index f1c4e3f..fd886b8 100644 --- a/kmymoney2/dialogs/knewbankdlg.cpp +++ b/kmymoney2/dialogs/knewbankdlg.cpp @@ -21,8 +21,8 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlabel.h> -#include <qpixmap.h> +#include <tqlabel.h> +#include <tqpixmap.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -43,8 +43,8 @@ #include "knewbankdlg.h" -KNewBankDlg::KNewBankDlg(MyMoneyInstitution& institution, QWidget *parent, const char *name) - : KNewBankDlgDecl(parent,name,true), m_institution(institution) +KNewBankDlg::KNewBankDlg(MyMoneyInstitution& institution, TQWidget *tqparent, const char *name) + : KNewBankDlgDecl(tqparent,name,true), m_institution(institution) { okBtn->setGuiItem(KStdGuiItem::ok()); cancelBtn->setGuiItem(KStdGuiItem::cancel()); @@ -58,17 +58,17 @@ KNewBankDlg::KNewBankDlg(MyMoneyInstitution& institution, QWidget *parent, const bicEdit->setText(institution.value("bic")); sortCodeEdit->setText(institution.sortcode()); - connect(okBtn, SIGNAL(clicked()), SLOT(okClicked())); - connect(cancelBtn, SIGNAL(clicked()), SLOT(reject())); - connect(nameEdit, SIGNAL(textChanged ( const QString & )), SLOT(institutionNameChanged( const QString &))); + connect(okBtn, TQT_SIGNAL(clicked()), TQT_SLOT(okClicked())); + connect(cancelBtn, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(nameEdit, TQT_SIGNAL(textChanged ( const TQString & )), TQT_SLOT(institutionNameChanged( const TQString &))); institutionNameChanged( nameEdit->text()); - kMandatoryFieldGroup* requiredFields = new kMandatoryFieldGroup (this); + kMandatoryFieldGroup* requiredFields = new kMandatoryFieldGroup (TQT_TQOBJECT(this)); requiredFields->setOkButton(okBtn); // button to be enabled when all fields present requiredFields->add(nameEdit); } -void KNewBankDlg::institutionNameChanged( const QString &_text) +void KNewBankDlg::institutionNameChanged( const TQString &_text) { okBtn->setEnabled( !_text.isEmpty() ); } diff --git a/kmymoney2/dialogs/knewbankdlg.h b/kmymoney2/dialogs/knewbankdlg.h index f829a4c..55deee1 100644 --- a/kmymoney2/dialogs/knewbankdlg.h +++ b/kmymoney2/dialogs/knewbankdlg.h @@ -20,7 +20,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qdialog.h> +#include <tqdialog.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -39,15 +39,16 @@ class KNewBankDlg : public KNewBankDlgDecl { Q_OBJECT + TQ_OBJECT public: - KNewBankDlg(MyMoneyInstitution& institution, QWidget *parent = 0, const char *name = 0); + KNewBankDlg(MyMoneyInstitution& institution, TQWidget *tqparent = 0, const char *name = 0); ~KNewBankDlg(); const MyMoneyInstitution& institution(void); protected slots: void okClicked(); - void institutionNameChanged( const QString &); + void institutionNameChanged( const TQString &); private: MyMoneyInstitution m_institution; diff --git a/kmymoney2/dialogs/knewbankdlgdecl.ui b/kmymoney2/dialogs/knewbankdlgdecl.ui index e6d4f52..71d496a 100644 --- a/kmymoney2/dialogs/knewbankdlgdecl.ui +++ b/kmymoney2/dialogs/knewbankdlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KNewBankDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>kNewBankDlgDecl</cstring> </property> @@ -28,7 +28,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -45,7 +45,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -58,11 +58,11 @@ <cstring>nameEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -77,11 +77,11 @@ <cstring>cityEdit</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -96,11 +96,11 @@ <cstring>streetEdit</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -115,11 +115,11 @@ <cstring>postcodeEdit</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -134,11 +134,11 @@ <cstring>telephoneEdit</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -153,11 +153,11 @@ <cstring>sortCodeEdit</cstring> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>TextLabel7</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> @@ -208,7 +208,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout51</cstring> </property> @@ -232,7 +232,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>449</width> <height>0</height> @@ -264,5 +264,5 @@ </widget> <tabstops> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/knewbudgetdlg.cpp b/kmymoney2/dialogs/knewbudgetdlg.cpp index 5971e54..67fcbda 100644 --- a/kmymoney2/dialogs/knewbudgetdlg.cpp +++ b/kmymoney2/dialogs/knewbudgetdlg.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qcheckbox.h> +#include <tqcheckbox.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -37,19 +37,19 @@ const int KNewBudgetDlg::m_icFutureYears = 5; const int KNewBudgetDlg::m_icPastYears = 2; -KNewBudgetDlg::KNewBudgetDlg(QWidget* parent, const char *name) : - KNewBudgetDlgDecl(parent, name) +KNewBudgetDlg::KNewBudgetDlg(TQWidget* tqparent, const char *name) : + KNewBudgetDlgDecl(tqparent, name) { - QStringList slYear; - QDate dToday = QDate::currentDate(); + TQStringList slYear; + TQDate dToday = TQDate::tqcurrentDate(); int iYear = dToday.year(); for (int i=0; i<=m_icFutureYears; i++) - m_cbYear->insertItem( QString::number(iYear++) ); + m_cbYear->insertItem( TQString::number(iYear++) ); iYear = dToday.year(); for (int i=0; i<=m_icFutureYears; i++) - m_cbYear->insertItem( QString::number(--iYear) ); + m_cbYear->insertItem( TQString::number(--iYear) ); } KNewBudgetDlg::~KNewBudgetDlg() diff --git a/kmymoney2/dialogs/knewbudgetdlg.h b/kmymoney2/dialogs/knewbudgetdlg.h index db63e11..697ecfd 100644 --- a/kmymoney2/dialogs/knewbudgetdlg.h +++ b/kmymoney2/dialogs/knewbudgetdlg.h @@ -21,13 +21,13 @@ // ---------------------------------------------------------------------------- // QT Includes -class QListViewItem; +class TQListViewItem; // ---------------------------------------------------------------------------- // KDE Includes -#include <qdatetime.h> -#include <qcombobox.h> -#include <qlineedit.h> +#include <tqdatetime.h> +#include <tqcombobox.h> +#include <tqlineedit.h> // ---------------------------------------------------------------------------- // Project Includes @@ -36,12 +36,13 @@ class QListViewItem; class KNewBudgetDlg : public KNewBudgetDlgDecl { Q_OBJECT + TQ_OBJECT public: - KNewBudgetDlg(QWidget* parent, const char *name); + KNewBudgetDlg(TQWidget* tqparent, const char *name); ~KNewBudgetDlg(); - QString& getYear() {return m_year;}; - QString& getName() {return m_name;}; + TQString& getYear() {return m_year;}; + TQString& getName() {return m_name;}; public slots: virtual void m_pbCancel_clicked(); @@ -52,8 +53,8 @@ private: static const int m_icFutureYears; static const int m_icPastYears; - QString m_year; - QString m_name; + TQString m_year; + TQString m_name; }; #endif // KNEWBUDGETDLG_H diff --git a/kmymoney2/dialogs/knewbudgetdlgdecl.ui b/kmymoney2/dialogs/knewbudgetdlgdecl.ui index 7066a56..7a18195 100644 --- a/kmymoney2/dialogs/knewbudgetdlgdecl.ui +++ b/kmymoney2/dialogs/knewbudgetdlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KNewBudgetDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KNewBudgetDlgDecl</cstring> </property> @@ -22,31 +22,31 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -54,7 +54,7 @@ <string>Name</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -64,20 +64,20 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_leBudgetName</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_cbYear</cstring> </property> @@ -100,9 +100,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -163,11 +163,11 @@ <includes> <include location="local" impldecl="in implementation">knewbudgetdlgdecl.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>m_pbOk_clicked()</slot> <slot>m_pbCancel_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> diff --git a/kmymoney2/dialogs/knewequityentrydecl.ui b/kmymoney2/dialogs/knewequityentrydecl.ui index affd116..4f97f92 100644 --- a/kmymoney2/dialogs/knewequityentrydecl.ui +++ b/kmymoney2/dialogs/knewequityentrydecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>kNewEquityEntryDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>kNewEquityEntryDecl</cstring> </property> @@ -22,15 +22,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblEquityName</cstring> </property> @@ -38,7 +38,7 @@ <string>Equity Name:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblType</cstring> </property> @@ -57,15 +57,15 @@ <string>Trading Symbol of the stock or mutual fund, not required.</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -80,7 +80,7 @@ <property name="text"> <string>1 /</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -91,7 +91,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblSymbol</cstring> </property> @@ -99,7 +99,7 @@ <string>Market Symbol:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -150,16 +150,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>81</width> <height>20</height> @@ -232,5 +232,5 @@ <tabstop>btnOK</tabstop> <tabstop>btnCancel</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/knewequityentrydlg.cpp b/kmymoney2/dialogs/knewequityentrydlg.cpp index 86a1ab8..29a91b3 100644 --- a/kmymoney2/dialogs/knewequityentrydlg.cpp +++ b/kmymoney2/dialogs/knewequityentrydlg.cpp @@ -36,19 +36,19 @@ #include "../widgets/kmymoneyedit.h" #include "../mymoney/mymoneymoney.h" -KNewEquityEntryDlg::KNewEquityEntryDlg(QWidget *parent, const char *name) - : kNewEquityEntryDecl(parent, name, TRUE) +KNewEquityEntryDlg::KNewEquityEntryDlg(TQWidget *tqparent, const char *name) + : kNewEquityEntryDecl(tqparent, name, TRUE) { edtFraction->setCalculatorButtonVisible(false); edtFraction->setPrecision(0); edtFraction->loadText("100"); - connect(btnOK, SIGNAL(clicked()), this, SLOT(onOKClicked())); - connect(btnCancel, SIGNAL(clicked()), this, SLOT(reject())); + connect(btnOK, TQT_SIGNAL(clicked()), this, TQT_SLOT(onOKClicked())); + connect(btnCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); - connect(edtFraction, SIGNAL(textChanged(const QString&)), this, SLOT(slotDataChanged())); - connect(edtMarketSymbol, SIGNAL(textChanged(const QString&)), this, SLOT(slotDataChanged())); - connect(edtEquityName, SIGNAL(textChanged(const QString&)), this, SLOT(slotDataChanged())); + connect(edtFraction, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotDataChanged())); + connect(edtMarketSymbol, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotDataChanged())); + connect(edtEquityName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotDataChanged())); // add icons to buttons btnOK->setGuiItem(KStdGuiItem::ok()); @@ -72,13 +72,13 @@ void KNewEquityEntryDlg::onOKClicked() accept(); } -void KNewEquityEntryDlg::setSymbolName(const QString& str) +void KNewEquityEntryDlg::setSymbolName(const TQString& str) { m_strSymbolName = str; edtMarketSymbol->setText(m_strSymbolName); } -void KNewEquityEntryDlg::setName(const QString& str) +void KNewEquityEntryDlg::setName(const TQString& str) { m_strName = str; edtEquityName->setText(m_strName); diff --git a/kmymoney2/dialogs/knewequityentrydlg.h b/kmymoney2/dialogs/knewequityentrydlg.h index 25605c6..d3a5a89 100644 --- a/kmymoney2/dialogs/knewequityentrydlg.h +++ b/kmymoney2/dialogs/knewequityentrydlg.h @@ -20,10 +20,10 @@ * * ***************************************************************************/ -#ifndef KNEWEQUITYENTRY_H -#define KNEWEQUITYENTRY_H +#ifndef KNEWETQUITYENTRY_H +#define KNEWETQUITYENTRY_H -#include <qdialog.h> +#include <tqdialog.h> #include <klocale.h> #include "../dialogs/knewequityentrydecl.h" @@ -39,15 +39,16 @@ class KNewEquityEntryDlg : public kNewEquityEntryDecl { Q_OBJECT + TQ_OBJECT public: - KNewEquityEntryDlg(QWidget *parent = NULL, const char *name = NULL); + KNewEquityEntryDlg(TQWidget *tqparent = NULL, const char *name = NULL); virtual ~KNewEquityEntryDlg(); - void setSymbolName(const QString& str); - QString symbolName(void) const { return m_strSymbolName; } + void setSymbolName(const TQString& str); + TQString symbolName(void) const { return m_strSymbolName; } - void setName(const QString& str); - QString name(void) const { return m_strName; } + void setName(const TQString& str); + TQString name(void) const { return m_strName; } int fraction(void) const { return m_fraction; } @@ -56,8 +57,8 @@ protected slots: void slotDataChanged(void); private: - QString m_strSymbolName; - QString m_strName; + TQString m_strSymbolName; + TQString m_strName; int m_fraction; }; diff --git a/kmymoney2/dialogs/knewfiledlg.cpp b/kmymoney2/dialogs/knewfiledlg.cpp index 2ea043f..7a3b221 100644 --- a/kmymoney2/dialogs/knewfiledlg.cpp +++ b/kmymoney2/dialogs/knewfiledlg.cpp @@ -19,9 +19,9 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qpixmap.h> -#include <qlineedit.h> -#include <qlabel.h> +#include <tqpixmap.h> +#include <tqlineedit.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Headers @@ -43,16 +43,16 @@ #include "knewfiledlg.h" -KNewFileDlg::KNewFileDlg(QWidget *parent, const char *name, const QString& title) - : KNewFileDlgDecl(parent,name,true) +KNewFileDlg::KNewFileDlg(TQWidget *tqparent, const char *name, const TQString& title) + : KNewFileDlgDecl(tqparent,name,true) { init(title); } -KNewFileDlg::KNewFileDlg(QString userName, QString userStreet, - QString userTown, QString userCounty, QString userPostcode, QString userTelephone, - QString userEmail, QWidget *parent, const char *name, const QString& title) - : KNewFileDlgDecl(parent,name,true) +KNewFileDlg::KNewFileDlg(TQString userName, TQString userStreet, + TQString userTown, TQString userCounty, TQString userPostcode, TQString userTelephone, + TQString userEmail, TQWidget *tqparent, const char *name, const TQString& title) + : KNewFileDlgDecl(tqparent,name,true) { userNameEdit->setText(userName); streetEdit->setText(userStreet); @@ -65,7 +65,7 @@ KNewFileDlg::KNewFileDlg(QString userName, QString userStreet, init(title); } -void KNewFileDlg::init(const QString& title) +void KNewFileDlg::init(const TQString& title) { bool showLoadButton = false; okBtn->setGuiItem(KStdGuiItem::ok()); @@ -86,9 +86,9 @@ void KNewFileDlg::init(const QString& title) userNameEdit->setFocus(); - connect(cancelBtn, SIGNAL(clicked()), this, SLOT(reject())); - connect(okBtn, SIGNAL(clicked()), this, SLOT(okClicked())); - connect(kabcBtn, SIGNAL(clicked()), this, SLOT(loadFromKABC())); + connect(cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(okClicked())); + connect(kabcBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadFromKABC())); } KNewFileDlg::~KNewFileDlg(){ diff --git a/kmymoney2/dialogs/knewfiledlg.h b/kmymoney2/dialogs/knewfiledlg.h index 706a139..3cf8c7c 100644 --- a/kmymoney2/dialogs/knewfiledlg.h +++ b/kmymoney2/dialogs/knewfiledlg.h @@ -19,7 +19,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qdialog.h> +#include <tqdialog.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -33,27 +33,28 @@ // Use the second constructor to edit a file. class KNewFileDlg : public KNewFileDlgDecl { Q_OBJECT + TQ_OBJECT public: - KNewFileDlg(QWidget *parent=0, const char *name=0, const QString& title=QString()); - KNewFileDlg(QString userName, QString userStreet, - QString userTown, QString userCounty, QString userPostcode, QString userTelephone, - QString userEmail, QWidget *parent=0, const char *name=0, const QString& title=QString()); + KNewFileDlg(TQWidget *tqparent=0, const char *name=0, const TQString& title=TQString()); + KNewFileDlg(TQString userName, TQString userStreet, + TQString userTown, TQString userCounty, TQString userPostcode, TQString userTelephone, + TQString userEmail, TQWidget *tqparent=0, const char *name=0, const TQString& title=TQString()); ~KNewFileDlg(); KPushButton* cancelButton(void) { return cancelBtn; }; public: - QString userNameText; - QString userStreetText; - QString userTownText; - QString userCountyText; - QString userPostcodeText; - QString userTelephoneText; - QString userEmailText; + TQString userNameText; + TQString userStreetText; + TQString userTownText; + TQString userCountyText; + TQString userPostcodeText; + TQString userTelephoneText; + TQString userEmailText; protected: /// helper method for constructors - void init(const QString& title); + void init(const TQString& title); protected slots: void okClicked(); diff --git a/kmymoney2/dialogs/knewfiledlgdecl.ui b/kmymoney2/dialogs/knewfiledlgdecl.ui index 9097a74..9658fad 100644 --- a/kmymoney2/dialogs/knewfiledlgdecl.ui +++ b/kmymoney2/dialogs/knewfiledlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KNewFileDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>kNewFileDlgDecl</cstring> </property> @@ -28,7 +28,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -42,7 +42,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -72,19 +72,19 @@ your KMyMoney file.</string> <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -94,26 +94,26 @@ your KMyMoney file.</string> <string>County/State:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>userNameEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>countyEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>townEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -123,16 +123,16 @@ your KMyMoney file.</string> <string>Street:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>streetEdit</cstring> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>TextLabel7</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -142,7 +142,7 @@ your KMyMoney file.</string> <string>Email:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -150,11 +150,11 @@ your KMyMoney file.</string> <string>Your name:</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -164,11 +164,11 @@ your KMyMoney file.</string> <string>Telephone:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -178,16 +178,16 @@ your KMyMoney file.</string> <string>Town:</string> </property> </widget> - <widget class="QLineEdit" row="6" column="1"> + <widget class="TQLineEdit" row="6" column="1"> <property name="name"> <cstring>emailEdit</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -197,21 +197,21 @@ your KMyMoney file.</string> <string>Postal Code:</string> </property> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>telephoneEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>postcodeEdit</cstring> </property> </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout22</cstring> + <cstring>tqlayout22</cstring> </property> <hbox> <property name="name"> @@ -235,7 +235,7 @@ your KMyMoney file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>305</width> <height>21</height> @@ -254,16 +254,16 @@ your KMyMoney file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -279,7 +279,7 @@ your KMyMoney file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>360</width> <height>16</height> @@ -324,5 +324,5 @@ your KMyMoney file.</string> <tabstop>okBtn</tabstop> <tabstop>cancelBtn</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/knewinvestmentwizard.cpp b/kmymoney2/dialogs/knewinvestmentwizard.cpp index d0c9046..a1e2e9e 100644 --- a/kmymoney2/dialogs/knewinvestmentwizard.cpp +++ b/kmymoney2/dialogs/knewinvestmentwizard.cpp @@ -18,8 +18,8 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqcheckbox.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -45,18 +45,18 @@ #include "../converter/webpricequote.h" #include "../kmymoneyutils.h" -KNewInvestmentWizard::KNewInvestmentWizard( QWidget *parent, const char *name ) : - KNewInvestmentWizardDecl( parent, name ) +KNewInvestmentWizard::KNewInvestmentWizard( TQWidget *tqparent, const char *name ) : + KNewInvestmentWizardDecl( tqparent, name ) { init1(); - slotCheckPage(QString()); + slotCheckPage(TQString()); m_investmentSymbol->setFocus(); - connect(m_investmentSymbol, SIGNAL(lineChanged(const QString&)), this, SLOT(slotCheckForExistingSymbol(const QString&))); + connect(m_investmentSymbol, TQT_SIGNAL(lineChanged(const TQString&)), this, TQT_SLOT(slotCheckForExistingSymbol(const TQString&))); } -KNewInvestmentWizard::KNewInvestmentWizard( const MyMoneyAccount& acc, QWidget *parent, const char *name ) : - KNewInvestmentWizardDecl( parent, name ), +KNewInvestmentWizard::KNewInvestmentWizard( const MyMoneyAccount& acc, TQWidget *tqparent, const char *name ) : + KNewInvestmentWizardDecl( tqparent, name ), m_account(acc) { setCaption(i18n("Investment detail wizard")); @@ -75,8 +75,8 @@ KNewInvestmentWizard::KNewInvestmentWizard( const MyMoneyAccount& acc, QWidget * } -KNewInvestmentWizard::KNewInvestmentWizard( const MyMoneySecurity& security, QWidget *parent, const char *name ) : - KNewInvestmentWizardDecl( parent, name ), +KNewInvestmentWizard::KNewInvestmentWizard( const MyMoneySecurity& security, TQWidget *tqparent, const char *name ) : + KNewInvestmentWizardDecl( tqparent, name ), m_security(security) { setCaption(i18n("Security detail wizard")); @@ -102,7 +102,7 @@ void KNewInvestmentWizard::init1(void) m_fraction->setPrecision(0); m_fraction->setValue(MyMoneyMoney(100, 1)); - kMyMoneyMoneyValidator* fractionValidator = new kMyMoneyMoneyValidator(1, 100000, 0, this); + kMyMoneyMoneyValidator* fractionValidator = new kMyMoneyMoneyValidator(1, 100000, 0, TQT_TQOBJECT(this)); m_fraction->setValidator(fractionValidator); // load the price mode combo @@ -111,16 +111,16 @@ void KNewInvestmentWizard::init1(void) m_priceMode->insertItem(i18n("Total for all shares"), 2); // load the widget with the available currencies - m_tradingCurrencyEdit->update(QString()); + m_tradingCurrencyEdit->update(TQString()); - connect(helpButton(),SIGNAL(clicked()), this, SLOT(slotHelp(void))); - connect(m_investmentName, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPage(void))); - connect(m_investmentSymbol, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPage(void))); - connect(m_fraction, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPage(void))); - connect(m_investmentIdentification, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPage(void))); - connect(m_onlineFactor, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPage(void))); - connect(m_onlineSourceCombo, SIGNAL(activated(const QString&)), this, SLOT(slotCheckPage(const QString&))); - connect(m_useFinanceQuote, SIGNAL(toggled(bool)), this, SLOT(slotSourceChanged(bool))); + connect(helpButton(),TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp(void))); + connect(m_investmentName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPage(void))); + connect(m_investmentSymbol, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPage(void))); + connect(m_fraction, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPage(void))); + connect(m_investmentIdentification, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPage(void))); + connect(m_onlineFactor, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPage(void))); + connect(m_onlineSourceCombo, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotCheckPage(const TQString&))); + connect(m_useFinanceQuote, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSourceChanged(bool))); m_createAccount = true; @@ -161,7 +161,7 @@ KNewInvestmentWizard::~KNewInvestmentWizard() { } -void KNewInvestmentWizard::setName(const QString& name) +void KNewInvestmentWizard::setName(const TQString& name) { m_investmentName->setText(name); } @@ -172,11 +172,11 @@ void KNewInvestmentWizard::next(void) slotCheckPage(); } -void KNewInvestmentWizard::slotCheckForExistingSymbol(const QString& symbol) +void KNewInvestmentWizard::slotCheckForExistingSymbol(const TQString& symbol) { if(m_investmentName->text().isEmpty()) { - QValueList<MyMoneySecurity> list = MyMoneyFile::instance()->securityList(); - QValueList<MyMoneySecurity>::const_iterator it_s; + TQValueList<MyMoneySecurity> list = MyMoneyFile::instance()->securityList(); + TQValueList<MyMoneySecurity>::const_iterator it_s; MyMoneySecurity::eSECURITYTYPE type = KMyMoneyUtils::stringToSecurity(m_securityType->currentText()); for(it_s = list.begin(); it_s != list.end(); ++it_s) { @@ -197,7 +197,7 @@ void KNewInvestmentWizard::slotCheckForExistingSymbol(const QString& symbol) void KNewInvestmentWizard::slotSourceChanged(bool useFQ) { m_onlineSourceCombo->clear(); - m_onlineSourceCombo->insertItem(QString(), 0); + m_onlineSourceCombo->insertItem(TQString(), 0); if (useFQ) { m_onlineSourceCombo->insertStringList( WebPriceQuote::quoteSources( WebPriceQuote::FinanceQuote ) ); } else { @@ -205,7 +205,7 @@ void KNewInvestmentWizard::slotSourceChanged(bool useFQ) } } -void KNewInvestmentWizard::slotCheckPage(const QString& txt) +void KNewInvestmentWizard::slotCheckPage(const TQString& txt) { m_onlineFactor->setEnabled(!txt.isEmpty()); } @@ -232,12 +232,12 @@ void KNewInvestmentWizard::slotHelp(void) kapp->invokeHelp("details.investments.newinvestmentwizard"); } -void KNewInvestmentWizard::createObjects(const QString& parentId) +void KNewInvestmentWizard::createObjects(const TQString& tqparentId) { MyMoneyFile* file = MyMoneyFile::instance(); - QValueList<MyMoneySecurity> list = MyMoneyFile::instance()->securityList(); - QValueList<MyMoneySecurity>::ConstIterator it; + TQValueList<MyMoneySecurity> list = MyMoneyFile::instance()->securityList(); + TQValueList<MyMoneySecurity>::ConstIterator it; MyMoneySecurity::eSECURITYTYPE type = KMyMoneyUtils::stringToSecurity(m_securityType->currentText()); MyMoneyFileTransaction ft; @@ -294,19 +294,19 @@ void KNewInvestmentWizard::createObjects(const QString& parentId) break; case 1: case 2: - m_account.setValue("priceMode", QString("%1").arg(m_priceMode->currentItem())); + m_account.setValue("priceMode", TQString("%1").tqarg(m_priceMode->currentItem())); break; } if(m_account.id().isEmpty()) { - MyMoneyAccount parent = file->account(parentId); - file->addAccount(m_account, parent); + MyMoneyAccount tqparent = file->account(tqparentId); + file->addAccount(m_account, tqparent); } else file->modifyAccount(m_account); } ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::detailedSorry(0, i18n("Unable to create all objects for the investment"), QString("%1 caugt in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); + KMessageBox::detailedSorry(0, i18n("Unable to create all objects for the investment"), TQString("%1 caugt in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); delete e; } } diff --git a/kmymoney2/dialogs/knewinvestmentwizard.h b/kmymoney2/dialogs/knewinvestmentwizard.h index 7540521..8e3be09 100644 --- a/kmymoney2/dialogs/knewinvestmentwizard.h +++ b/kmymoney2/dialogs/knewinvestmentwizard.h @@ -39,45 +39,46 @@ class KNewInvestmentWizard : public KNewInvestmentWizardDecl { Q_OBJECT + TQ_OBJECT public: /** * Use this constructor for the creation of a new investment */ - KNewInvestmentWizard( QWidget *parent = 0, const char *name = 0 ); + KNewInvestmentWizard( TQWidget *tqparent = 0, const char *name = 0 ); /** * Use this constructor for the modification of an existing investment */ - KNewInvestmentWizard( const MyMoneyAccount& acc, QWidget *parent = 0, const char *name = 0 ); + KNewInvestmentWizard( const MyMoneyAccount& acc, TQWidget *tqparent = 0, const char *name = 0 ); /** * Use this constructor for the modification of an existing security */ - KNewInvestmentWizard( const MyMoneySecurity& sec, QWidget *parent = 0, const char *name = 0 ); + KNewInvestmentWizard( const MyMoneySecurity& sec, TQWidget *tqparent = 0, const char *name = 0 ); ~KNewInvestmentWizard(); /** * This method sets the name in the name widget. */ - void setName(const QString& name); + void setName(const TQString& name); /** * Depending on the constructor used, this method either * creates all necessary objects for the investment or updates * them. * - * @param parentId id of parent account for the investment + * @param tqparentId id of tqparent account for the investment */ - void createObjects(const QString& parentId); + void createObjects(const TQString& tqparentId); const MyMoneyAccount& account(void) const { return m_account; } protected slots: void next(void); void slotCheckPage(void); - void slotCheckPage(const QString&); - void slotCheckForExistingSymbol(const QString&); + void slotCheckPage(const TQString&); + void slotCheckForExistingSymbol(const TQString&); void slotSourceChanged(bool); void slotHelp(void); diff --git a/kmymoney2/dialogs/knewinvestmentwizarddecl.ui b/kmymoney2/dialogs/knewinvestmentwizarddecl.ui index a6e9241..c6936c6 100644 --- a/kmymoney2/dialogs/knewinvestmentwizarddecl.ui +++ b/kmymoney2/dialogs/knewinvestmentwizarddecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KNewInvestmentWizardDecl</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>KNewInvestmentWizardDecl</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>New Investment wizard</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_investmentTypePage</cstring> </property> @@ -26,14 +26,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_introLabel</cstring> </property> <property name="text"> <string>This wizard allows you to create a new investment.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -47,21 +47,21 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>10</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string>The first step in this process requires to select the type of investment. The following steps collect more details about the investment from you.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -75,22 +75,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> @@ -156,7 +156,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_investmentDetailsPage</cstring> </property> @@ -167,14 +167,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_2</cstring> </property> <property name="text"> <string>Enter the details below and click <b>Next</b> to continue entering the online update details.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -188,16 +188,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -208,15 +208,15 @@ <cstring>m_investmentName</cstring> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5</cstring> </property> @@ -231,7 +231,7 @@ <property name="text"> <string>1 /</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -242,7 +242,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel2_5</cstring> </property> @@ -250,7 +250,7 @@ <string>Price entry</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2_2_2</cstring> </property> @@ -258,7 +258,7 @@ <string>Fraction</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -266,7 +266,7 @@ <string>Trading Currency</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -317,7 +317,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -325,7 +325,7 @@ <string>Trading symbol</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -354,7 +354,7 @@ <string>Enter the CUSIP/ISIN/WKN identification number here</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -374,7 +374,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -383,7 +383,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_onlineUpdatePage</cstring> </property> @@ -394,20 +394,20 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6</cstring> </property> <property name="text"> <string>Select an online source and click <b>Finish</b> to store the investment data. If you don't want to use online updates, just leave the data as is.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout25</cstring> + <cstring>tqlayout25</cstring> </property> <hbox> <property name="name"> @@ -419,23 +419,23 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout21</cstring> + <cstring>tqlayout21</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_4</cstring> </property> @@ -443,7 +443,7 @@ <string>Use Finance::Quote</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_useFinanceQuote</cstring> </property> @@ -453,15 +453,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -478,7 +478,7 @@ <property name="name"> <cstring>m_onlineSourceCombo</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>180</width> <height>0</height> @@ -487,15 +487,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout22</cstring> + <cstring>tqlayout22</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_6</cstring> </property> @@ -522,7 +522,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>371</width> <height>20</height> @@ -541,7 +541,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>181</height> @@ -587,5 +587,10 @@ <tabstop>m_onlineSourceCombo</tabstop> <tabstop>m_onlineFactor</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp index 28c48ef..e56dbf9 100644 --- a/kmymoney2/dialogs/knewloanwizard.cpp +++ b/kmymoney2/dialogs/knewloanwizard.cpp @@ -25,9 +25,9 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -59,38 +59,38 @@ #include "../kmymoney2.h" -KNewLoanWizard::KNewLoanWizard(QWidget *parent, const char *name ) : - KNewLoanWizardDecl(parent, name, true) +KNewLoanWizard::KNewLoanWizard(TQWidget *tqparent, const char *name ) : + KNewLoanWizardDecl(tqparent, name, true) { - connect(m_borrowButton, SIGNAL(clicked()), this, SLOT(slotLiabilityLoan())); - connect(m_lendButton, SIGNAL(clicked()), this, SLOT(slotAssetLoan())); + connect(m_borrowButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLiabilityLoan())); + connect(m_lendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAssetLoan())); - connect(m_nameEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPageFinished())); - // connect(m_payeeEdit, SIGNAL(newPayee(const QString&)), this, SLOT(slotNewPayee(const QString&))); - connect(m_payeeEdit, SIGNAL(createItem(const QString&, QString&)), this, SIGNAL(createPayee(const QString&, QString&))); + connect(m_nameEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPageFinished())); + // connect(m_payeeEdit, TQT_SIGNAL(newPayee(const TQString&)), this, TQT_SLOT(slotNewPayee(const TQString&))); + connect(m_payeeEdit, TQT_SIGNAL(createItem(const TQString&, TQString&)), this, TQT_SIGNAL(createPayee(const TQString&, TQString&))); - connect(m_previousPaymentButton, SIGNAL(clicked()), this, SLOT(slotPaymentsMade())); - connect(m_noPreviousPaymentButton, SIGNAL(clicked()), this, SLOT(slotNoPaymentsMade())); + connect(m_previousPaymentButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPaymentsMade())); + connect(m_noPreviousPaymentButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNoPaymentsMade())); - connect(m_allPaymentsButton, SIGNAL(clicked()), this, SLOT(slotRecordAllPayments())); - connect(m_thisYearPaymentButton, SIGNAL(clicked()), this, SLOT(slotRecordThisYearsPayments())); + connect(m_allPaymentsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRecordAllPayments())); + connect(m_thisYearPaymentButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRecordThisYearsPayments())); - connect(m_firstDueDateEdit, SIGNAL(dateChanged(const QDate&)), this, SLOT(slotCheckPageFinished())); + connect(m_firstDueDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), this, TQT_SLOT(slotCheckPageFinished())); - connect(m_interestOnPaymentButton, SIGNAL(clicked()), this, SLOT(slotInterestOnPayment())); - connect(m_interestOnReceptionButton, SIGNAL(clicked()), this, SLOT(slotInterestOnReception())); + connect(m_interestOnPaymentButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInterestOnPayment())); + connect(m_interestOnReceptionButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInterestOnReception())); - connect(m_loanAmountEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotCheckPageFinished())); + connect(m_loanAmountEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotCheckPageFinished())); - connect(m_interestAccountEdit, SIGNAL(stateChanged()), this, SLOT(slotCheckPageFinished())); + connect(m_interestAccountEdit, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(slotCheckPageFinished())); - connect(m_nextDueDateEdit, SIGNAL(dateChanged(const QDate&)), this, SLOT(slotCheckPageFinished())); - connect(m_paymentAccountEdit, SIGNAL(stateChanged()), this, SLOT(slotCheckPageFinished())); + connect(m_nextDueDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), this, TQT_SLOT(slotCheckPageFinished())); + connect(m_paymentAccountEdit, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(slotCheckPageFinished())); - connect(m_assetAccountEdit, SIGNAL(stateChanged()), this, SLOT(slotCheckPageFinished())); - connect(m_dontCreatePayoutCheckBox, SIGNAL(clicked()), this, SLOT(slotCheckPageFinished())); + connect(m_assetAccountEdit, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(slotCheckPageFinished())); + connect(m_dontCreatePayoutCheckBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckPageFinished())); - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotReloadEditWidgets())); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotReloadEditWidgets())); loadComboBoxes(); @@ -111,7 +111,7 @@ KNewLoanWizard::KNewLoanWizard(QWidget *parent, const char *name ) : m_interestFrequencyAmountEdit->setValue(1); m_interestFrequencyUnitEdit->setCurrentItem(static_cast<int>(MyMoneyAccountLoan::changeYearly)); m_paymentFrequencyUnitEdit->setCurrentItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_MONTHLY))); - m_firstDueDateEdit->loadDate(QDate(QDate::currentDate().year(),QDate::currentDate().month(),30)); + m_firstDueDateEdit->loadDate(TQDate(TQDate::tqcurrentDate().year(),TQDate::tqcurrentDate().month(),30)); m_paymentAccountEdit->removeButtons(); m_assetAccountEdit->removeButtons(); @@ -120,25 +120,25 @@ KNewLoanWizard::KNewLoanWizard(QWidget *parent, const char *name ) : // load button icons KIconLoader* il = KGlobal::iconLoader(); KGuiItem createCategoryButtenItem( i18n( "&Create..." ), - QIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), i18n("Create a new category"), i18n("Use this to open the new account editor")); m_createCategoryButton->setGuiItem(createCategoryButtenItem); - connect(m_createCategoryButton, SIGNAL(clicked()), this, SLOT(slotCreateCategory())); + connect(m_createCategoryButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateCategory())); KGuiItem additionalFeeButtenItem( i18n( "&Additional fees..." ), - 0, //QIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), + 0, //TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), i18n("Enter additional fees"), i18n("Use this to add any additional fees other than principal and interest contained in your periodical payments.")); m_additionalFeeButton->setGuiItem(additionalFeeButtenItem); - connect(m_additionalFeeButton, SIGNAL(clicked()), this, SLOT(slotAdditionalFees())); + connect(m_additionalFeeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdditionalFees())); KGuiItem createAssetButtenItem( i18n( "&Create..." ), - QIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), i18n("Create a new asset account"), i18n("Use this to create a new account to which the initial payment should be made")); m_createNewAssetButton->setGuiItem(createAssetButtenItem); - connect(m_createNewAssetButton, SIGNAL(clicked()), kmymoney2, SLOT(slotAccountNew())); + connect(m_createNewAssetButton, TQT_SIGNAL(clicked()), kmymoney2, TQT_SLOT(slotAccountNew())); // enable the finish button on the last page setFinishEnabled(m_summaryPage, true); @@ -170,35 +170,35 @@ KNewLoanWizard::~KNewLoanWizard() void KNewLoanWizard::resetCalculator(void) { - m_loanAmount1->setText(QString()); - m_interestRate1->setText(QString()); - m_duration1->setText(QString()); - m_payment1->setText(QString()); - m_balloon1->setText(QString()); - - m_loanAmount2->setText(QString()); - m_interestRate2->setText(QString()); - m_duration2->setText(QString()); - m_payment2->setText(QString()); - m_balloon2->setText(QString()); - - m_loanAmount3->setText(QString()); - m_interestRate3->setText(QString()); - m_duration3->setText(QString()); - m_payment3->setText(QString()); - m_balloon3->setText(QString()); - - m_loanAmount4->setText(QString()); - m_interestRate4->setText(QString()); - m_duration4->setText(QString()); - m_payment4->setText(QString()); - m_balloon4->setText(QString()); - - m_loanAmount5->setText(QString()); - m_interestRate5->setText(QString()); - m_duration5->setText(QString()); - m_payment5->setText(QString()); - m_balloon5->setText(QString()); + m_loanAmount1->setText(TQString()); + m_interestRate1->setText(TQString()); + m_duration1->setText(TQString()); + m_payment1->setText(TQString()); + m_balloon1->setText(TQString()); + + m_loanAmount2->setText(TQString()); + m_interestRate2->setText(TQString()); + m_duration2->setText(TQString()); + m_payment2->setText(TQString()); + m_balloon2->setText(TQString()); + + m_loanAmount3->setText(TQString()); + m_interestRate3->setText(TQString()); + m_duration3->setText(TQString()); + m_payment3->setText(TQString()); + m_balloon3->setText(TQString()); + + m_loanAmount4->setText(TQString()); + m_interestRate4->setText(TQString()); + m_duration4->setText(TQString()); + m_payment4->setText(TQString()); + m_balloon4->setText(TQString()); + + m_loanAmount5->setText(TQString()); + m_interestRate5->setText(TQString()); + m_duration5->setText(TQString()); + m_payment5->setText(TQString()); + m_balloon5->setText(TQString()); m_additionalCost->setText(MyMoneyMoney(0).formatMoney(m_account.fraction(MyMoneyFile::instance()->security(m_account.currencyId())))); } @@ -229,14 +229,14 @@ void KNewLoanWizard::slotNoPaymentsMade(void) void KNewLoanWizard::slotRecordAllPayments(void) { m_firstPaymentLabel->setText( - QString("\n") + + TQString("\n") + i18n("Please enter the date, the first payment for this loan was/is due.")); m_firstPaymentNote->setText( i18n("Note: Consult the loan contract for details of the first due date. " "Keep in mind, that the first due date usually differs from the date " "the contract was signed")); m_balanceLabel->setText( - QString("\n") + + TQString("\n") + i18n("Please enter the original loan amount in the field below or leave it " "empty to be calculated.")); } @@ -244,13 +244,13 @@ void KNewLoanWizard::slotRecordAllPayments(void) void KNewLoanWizard::slotRecordThisYearsPayments(void) { m_firstPaymentLabel->setText( - QString("\n") + + TQString("\n") + i18n("Please enter the date, the first payment for this loan was/is due this year.")); m_firstPaymentNote->setText( i18n("Note: You can easily figure out the date of the first payment " "if you consult the last statement of last year.")); m_balanceLabel->setText( - QString("\n") + + TQString("\n") + i18n("Please enter the remaining loan amount of last years final " "statement in the field below. You should not leave this field empty.")); } @@ -306,9 +306,9 @@ void KNewLoanWizard::slotCheckPageFinished(void) void KNewLoanWizard::updateLoanAmount(void) { - QString txt; + TQString txt; if(m_loanAmountEdit->lineedit()->text().isEmpty()) { - txt = QString("<") + i18n("calculate") + QString(">"); + txt = TQString("<") + i18n("calculate") + TQString(">"); } else { txt = m_loanAmountEdit->value().formatMoney(m_account.fraction(MyMoneyFile::instance()->security(m_account.currencyId()))); } @@ -321,11 +321,11 @@ void KNewLoanWizard::updateLoanAmount(void) void KNewLoanWizard::updateInterestRate(void) { - QString txt; + TQString txt; if(m_interestRateEdit->lineedit()->text().isEmpty()) { - txt = QString("<") + i18n("calculate") + QString(">"); + txt = TQString("<") + i18n("calculate") + TQString(">"); } else { - txt = m_interestRateEdit->value().formatMoney("", 3) + QString("%"); + txt = m_interestRateEdit->value().formatMoney("", 3) + TQString("%"); } m_interestRate1->setText(txt); m_interestRate2->setText(txt); @@ -336,11 +336,11 @@ void KNewLoanWizard::updateInterestRate(void) void KNewLoanWizard::updateDuration(void) { - QString txt; + TQString txt; if(m_durationValueEdit->value() == 0) { - txt = QString("<") + i18n("calculate") + QString(">"); + txt = TQString("<") + i18n("calculate") + TQString(">"); } else { - txt = QString().sprintf("%d ", m_durationValueEdit->value()) + txt = TQString().sprintf("%d ", m_durationValueEdit->value()) + m_durationUnitEdit->currentText(); } m_duration1->setText(txt); @@ -352,9 +352,9 @@ void KNewLoanWizard::updateDuration(void) void KNewLoanWizard::updatePayment(void) { - QString txt; + TQString txt; if(m_paymentEdit->lineedit()->text().isEmpty()) { - txt = QString("<") + i18n("calculate") + QString(">"); + txt = TQString("<") + i18n("calculate") + TQString(">"); } else { txt = m_paymentEdit->value().formatMoney(m_account.fraction(MyMoneyFile::instance()->security(m_account.currencyId()))); } @@ -368,9 +368,9 @@ void KNewLoanWizard::updatePayment(void) void KNewLoanWizard::updateFinalPayment(void) { - QString txt; + TQString txt; if(m_finalPaymentEdit->lineedit()->text().isEmpty()) { - txt = QString("<") + i18n("calculate") + QString(">"); + txt = TQString("<") + i18n("calculate") + TQString(">"); } else { txt = m_finalPaymentEdit->value().formatMoney(m_account.fraction(MyMoneyFile::instance()->security(m_account.currencyId()))); } @@ -390,12 +390,12 @@ void KNewLoanWizard::updateLoanInfo(void) updateFinalPayment(); updatePeriodicPayment(); - QString txt; + TQString txt; int fraction = m_account.fraction(MyMoneyFile::instance()->security(m_account.currencyId())); m_loanAmount6->setText(m_loanAmountEdit->value().formatMoney(fraction)); - m_interestRate6->setText(m_interestRateEdit->value().formatMoney("", 3) + QString("%")); - txt = QString().sprintf("%d ", m_durationValueEdit->value()) + m_interestRate6->setText(m_interestRateEdit->value().formatMoney("", 3) + TQString("%")); + txt = TQString().sprintf("%d ", m_durationValueEdit->value()) + m_durationUnitEdit->currentText(); m_duration6->setText(txt); m_payment6->setText(m_paymentEdit->value().formatMoney(fraction)); @@ -439,7 +439,7 @@ void KNewLoanWizard::updateSummary(void) // Payment try { - QStringList sel = m_interestAccountEdit->selectedItems(); + TQStringList sel = m_interestAccountEdit->selectedItems(); if(sel.count() != 1) throw new MYMONEYEXCEPTION("Need a single selected interest category"); MyMoneyAccount acc = MyMoneyFile::instance()->account(sel.first()); @@ -453,7 +453,7 @@ void KNewLoanWizard::updateSummary(void) m_summaryNextPayment->setText(KGlobal::locale()->formatDate(m_nextDueDateEdit->date(), true)); try { - QStringList sel = m_paymentAccountEdit->selectedItems(); + TQStringList sel = m_paymentAccountEdit->selectedItems(); if(sel.count() != 1) throw new MYMONEYEXCEPTION("Need a single selected payment account"); MyMoneyAccount acc = MyMoneyFile::instance()->account(sel.first()); @@ -467,7 +467,7 @@ void KNewLoanWizard::updateSummary(void) void KNewLoanWizard::next() { bool dontLeavePage = false; - QString errMsg = i18n( + TQString errMsg = i18n( "The loan wizard is unable to calculate two different values for your loan " "at the same time. " "Please enter a value for the %1 on this page or backup to the page where the " @@ -510,7 +510,7 @@ void KNewLoanWizard::next() if(m_loanAmountEdit->lineedit()->text().isEmpty() && m_interestRateEdit->lineedit()->text().isEmpty()) { dontLeavePage = true; - KMessageBox::error(0, errMsg.arg(i18n("interest rate")), i18n("Calculation error")); + KMessageBox::error(0, errMsg.tqarg(i18n("interest rate")), i18n("Calculation error")); } else updateInterestRate(); @@ -519,7 +519,7 @@ void KNewLoanWizard::next() || m_interestRateEdit->lineedit()->text().isEmpty()) && m_durationValueEdit->value() == 0) { dontLeavePage = true; - KMessageBox::error(0, errMsg.arg(i18n("term")), i18n("Calculation error")); + KMessageBox::error(0, errMsg.tqarg(i18n("term")), i18n("Calculation error")); } else updateDuration(); @@ -529,7 +529,7 @@ void KNewLoanWizard::next() || m_durationValueEdit->value() == 0) && m_paymentEdit->lineedit()->text().isEmpty()) { dontLeavePage = true; - KMessageBox::error(0, errMsg.arg(i18n("principal and interest")), i18n("Calculation error")); + KMessageBox::error(0, errMsg.tqarg(i18n("principal and interest")), i18n("Calculation error")); } else updatePayment(); @@ -557,7 +557,7 @@ void KNewLoanWizard::next() if(m_assetAccountPage) setAppropriate(m_assetAccountPage, true); } else { - QDate nextPayment(QDate::currentDate().year(), 1, m_firstDueDateEdit->date().day()); + TQDate nextPayment(TQDate::tqcurrentDate().year(), 1, m_firstDueDateEdit->date().day()); m_nextDueDateEdit->setDate(nextPayment); if(m_assetAccountPage) setAppropriate(m_assetAccountPage, false); @@ -626,7 +626,7 @@ void KNewLoanWizard::loadComboBoxes(void) m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_MONTHLY))); m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS))); m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYOTHERMONTH))); - m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_QUARTERLY))); + m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TQUARTERLY))); m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYFOURMONTHS))); m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TWICEYEARLY))); m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_YEARLY))); @@ -654,7 +654,7 @@ int KNewLoanWizard::calculateLoan(void) MyMoneyFinancialCalculator calc; long double val; int PF; - QString result; + TQString result; // FIXME: for now, we only support interest calculation at the end of the period calc.setBep(); @@ -709,14 +709,14 @@ int KNewLoanWizard::calculateLoan(void) val = calc.presentValue(); m_loanAmountEdit->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney(fraction)); result = i18n("KMyMoney has calculated the amount of the loan as %1.") - .arg(m_loanAmountEdit->lineedit()->text()); + .tqarg(m_loanAmountEdit->lineedit()->text()); } else if(m_interestRateEdit->lineedit()->text().isEmpty()) { // calculate the interest rate out of the other information val = calc.interestRate(); m_interestRateEdit->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney("", 3)); result = i18n("KMyMoney has calculated the interest rate to %1%.") - .arg(m_interestRateEdit->lineedit()->text()); + .tqarg(m_interestRateEdit->lineedit()->text()); } else if(m_paymentEdit->lineedit()->text().isEmpty()) { // calculate the periodical amount of the payment out of the other information @@ -729,7 +729,7 @@ int KNewLoanWizard::calculateLoan(void) calc.setPmt(val); result = i18n("KMyMoney has calculated a periodic payment of %1 to cover principal and interest.") - .arg(m_paymentEdit->lineedit()->text()); + .tqarg(m_paymentEdit->lineedit()->text()); val = calc.futureValue(); if((m_borrowButton->isChecked() && val < 0 && fabsl(val) >= fabsl(calc.payment())) @@ -739,9 +739,9 @@ int KNewLoanWizard::calculateLoan(void) val = calc.futureValue(); MyMoneyMoney refVal(static_cast<double>(val)); m_finalPaymentEdit->loadText(refVal.abs().formatMoney(fraction)); - result += QString(" "); + result += TQString(" "); result += i18n("The number of payments has been decremented and the final payment has been modified to %1.") - .arg(m_finalPaymentEdit->lineedit()->text()); + .tqarg(m_finalPaymentEdit->lineedit()->text()); } else if((m_borrowButton->isChecked() && val < 0 && fabsl(val) < fabsl(calc.payment())) || (m_lendButton->isChecked() && val > 0 && fabs(val) < fabs(calc.payment()))) { m_finalPaymentEdit->loadText(MyMoneyMoney(0,1).formatMoney(fraction)); @@ -749,7 +749,7 @@ int KNewLoanWizard::calculateLoan(void) MyMoneyMoney refVal(static_cast<double>(val)); m_finalPaymentEdit->loadText(refVal.abs().formatMoney(fraction)); result += i18n("The final payment has been modified to %1.") - .arg(m_finalPaymentEdit->lineedit()->text()); + .tqarg(m_finalPaymentEdit->lineedit()->text()); } } else if(m_durationValueEdit->value() == 0) { @@ -761,7 +761,7 @@ int KNewLoanWizard::calculateLoan(void) // if the number of payments has a fractional part, then we // round it to the smallest integer and calculate the balloon payment result = i18n("KMyMoney has calculated the term of your loan as %1. ") - .arg(updateTermWidgets(floorl(val))); + .tqarg(updateTermWidgets(floorl(val))); if(val != floorl(val)) { calc.setNpp(floorl(val)); @@ -769,7 +769,7 @@ int KNewLoanWizard::calculateLoan(void) MyMoneyMoney refVal(static_cast<double>(val)); m_finalPaymentEdit->loadText(refVal.abs().formatMoney(fraction)); result += i18n("The final payment has been modified to %1.") - .arg(m_finalPaymentEdit->lineedit()->text()); + .tqarg(m_finalPaymentEdit->lineedit()->text()); } } else { @@ -800,7 +800,7 @@ int KNewLoanWizard::calculateLoan(void) MyMoneyMoney refVal(static_cast<double>(val)); result = i18n("KMyMoney has calculated a final payment of %1 for this loan.") - .arg(refVal.abs().formatMoney(fraction)); + .tqarg(refVal.abs().formatMoney(fraction)); if(!m_finalPaymentEdit->lineedit()->text().isEmpty()) { if((m_finalPaymentEdit->value().abs() - refVal.abs()).abs().toDouble() > 1) { @@ -827,11 +827,11 @@ int KNewLoanWizard::calculateLoan(void) return 1; } -QString KNewLoanWizard::updateTermWidgets(const long double val) +TQString KNewLoanWizard::updateTermWidgets(const long double val) { long long vl = static_cast<long long>(floorl(val)); - QString valString; + TQString valString; MyMoneySchedule::occurenceE unit; unit = MyMoneySchedule::stringToOccurence(m_paymentFrequencyUnitEdit->currentText()); @@ -874,12 +874,12 @@ void KNewLoanWizard::slotCreateCategory(void) acc.setParentAccountId(base.id()); KNewAccountDlg* dlg = new KNewAccountDlg(acc, true, true); - if(dlg->exec() == QDialog::Accepted) { + if(dlg->exec() == TQDialog::Accepted) { acc = dlg->account(); MyMoneyFileTransaction ft; try { - QString id; + TQString id; id = file->createCategory(base, acc.name()); if(id.isEmpty()) throw new MYMONEYEXCEPTION("failure while creating the account hierarchy"); @@ -889,7 +889,7 @@ void KNewLoanWizard::slotCreateCategory(void) m_interestAccountEdit->setSelected(id); } catch (MyMoneyException *e) { - KMessageBox::information(this, i18n("Unable to add account: %1").arg(e->what())); + KMessageBox::information(this, i18n("Unable to add account: %1").tqarg(e->what())); delete e; } } @@ -921,17 +921,17 @@ void KNewLoanWizard::loadAccountList(void) void KNewLoanWizard::slotAdditionalFees(void) { - // KMessageBox::information(0, QString("Not yet implemented ... if you want to help, contact kmymoney2-developer@lists.sourceforge.net"), QString("Development notice")); + // KMessageBox::information(0, TQString("Not yet implemented ... if you want to help, contact kmymoney2-developer@lists.sourceforge.net"), TQString("Development notice")); MyMoneyAccount account("Phony-ID", MyMoneyAccount()); - QMap<QString, MyMoneyMoney> priceInfo; + TQMap<TQString, MyMoneyMoney> priceInfo; KSplitTransactionDlg* dlg = new KSplitTransactionDlg(m_transaction, m_split, account, false, !m_borrowButton->isChecked(), MyMoneyMoney(0), priceInfo); - connect(dlg, SIGNAL(newCategory(MyMoneyAccount&)), this, SIGNAL(newCategory(MyMoneyAccount&))); + connect(dlg, TQT_SIGNAL(newCategory(MyMoneyAccount&)), this, TQT_SIGNAL(newCategory(MyMoneyAccount&))); - if(dlg->exec() == QDialog::Accepted) { + if(dlg->exec() == TQDialog::Accepted) { m_transaction = dlg->transaction(); // sum up the additional fees - QValueList<MyMoneySplit>::ConstIterator it; + TQValueList<MyMoneySplit>::ConstIterator it; MyMoneyMoney fees; for(it = m_transaction.splits().begin(); it != m_transaction.splits().end(); ++it) { @@ -980,7 +980,7 @@ MyMoneyTransaction KNewLoanWizard::transaction() const sInterest.setAction(MyMoneySplit::ActionInterest); // payee - QString payeeId = m_payeeEdit->selectedItem(); + TQString payeeId = m_payeeEdit->selectedItem(); sPayment.setPayeeId(payeeId); sAmortization.setPayeeId(payeeId); @@ -994,7 +994,7 @@ MyMoneyTransaction KNewLoanWizard::transaction() const t.addSplit(sInterest); // copy the splits from the other costs and update the payment split - QValueList<MyMoneySplit>::ConstIterator it; + TQValueList<MyMoneySplit>::ConstIterator it; for(it = m_transaction.splits().begin(); it != m_transaction.splits().end(); ++it) { if((*it).accountId() != account.id()) { MyMoneySplit sp = (*it); @@ -1014,8 +1014,8 @@ MyMoneySchedule KNewLoanWizard::schedule(void) const MyMoneySchedule::TYPE_LOANPAYMENT, MyMoneySchedule::stringToOccurence(m_paymentFrequencyUnitEdit->currentText()), 1, MyMoneySchedule::STYPE_OTHER, - QDate(), - QDate(), + TQDate(), + TQDate(), false, false); @@ -1032,7 +1032,7 @@ void KNewLoanWizard::slotReloadEditWidgets(void) loadAccountList(); // reload payee widget - QString payeeId = m_payeeEdit->selectedItem(); + TQString payeeId = m_payeeEdit->selectedItem(); m_payeeEdit->loadPayees(MyMoneyFile::instance()->payeeList()); @@ -1069,18 +1069,18 @@ int KNewLoanWizard::term(void) const return factor; } -QString KNewLoanWizard::initialPaymentAccount(void) const +TQString KNewLoanWizard::initialPaymentAccount(void) const { if(m_dontCreatePayoutCheckBox->isChecked()) { - return QString(); + return TQString(); } return m_assetAccountEdit->selectedItems().first(); } -QDate KNewLoanWizard::initialPaymentDate(void) const +TQDate KNewLoanWizard::initialPaymentDate(void) const { if(m_dontCreatePayoutCheckBox->isChecked()) { - return QDate(); + return TQDate(); } return m_paymentDate->date(); } diff --git a/kmymoney2/dialogs/knewloanwizard.h b/kmymoney2/dialogs/knewloanwizard.h index 5e291b7..8cf019d 100644 --- a/kmymoney2/dialogs/knewloanwizard.h +++ b/kmymoney2/dialogs/knewloanwizard.h @@ -26,7 +26,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> +#include <tqwidget.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -54,8 +54,9 @@ class KNewLoanWizard : public KNewLoanWizardDecl { Q_OBJECT + TQ_OBJECT public: - KNewLoanWizard(QWidget *parent=0, const char *name=0); + KNewLoanWizard(TQWidget *tqparent=0, const char *name=0); ~KNewLoanWizard(); /** @@ -75,20 +76,20 @@ public: * This method returns the id of the account to/from which * the payout should be created. If the checkbox that allows * to skip the creation of this transaction is checked, this - * method returns QString() + * method returns TQString() * - * @return id of account or empty QString + * @return id of account or empty TQString */ - QString initialPaymentAccount(void) const; + TQString initialPaymentAccount(void) const; /** * This method returns the date of the payout transaction. * If the checkbox that allows to skip the creation of - * this transaction is checked, this method returns QDate() + * this transaction is checked, this method returns TQDate() * - * @return selected date or invalid QDate if checkbox is selected. + * @return selected date or invalid TQDate if checkbox is selected. */ - QDate initialPaymentDate(void) const; + TQDate initialPaymentDate(void) const; protected: /** @@ -114,7 +115,7 @@ protected slots: void slotInterestOnReception(void); void slotCreateCategory(void); virtual void slotAdditionalFees(void); - // void slotNewPayee(const QString&); + // void slotNewPayee(const TQString&); void slotReloadEditWidgets(void); protected: @@ -127,7 +128,7 @@ protected: void updatePayment(void); void updateFinalPayment(void); void updateLoanInfo(void); - QString updateTermWidgets(const long double v); + TQString updateTermWidgets(const long double v); void updatePeriodicPayment(void); void updateSummary(void); int calculateLoan(void); @@ -156,7 +157,7 @@ signals: * @param txt The name of the payee to be created * @param id A connected slot should store the id of the created object in this variable */ - void createPayee(const QString& txt, QString& id); + void createPayee(const TQString& txt, TQString& id); protected: MyMoneyAccountLoan m_account; diff --git a/kmymoney2/dialogs/knewloanwizarddecl.ui b/kmymoney2/dialogs/knewloanwizarddecl.ui index d45eb4b..6a70458 100644 --- a/kmymoney2/dialogs/knewloanwizarddecl.ui +++ b/kmymoney2/dialogs/knewloanwizarddecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KNewLoanWizardDecl</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>KNewLoanWizardDecl</cstring> </property> @@ -12,7 +12,7 @@ <height>458</height> </rect> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>800</width> <height>32767</height> @@ -28,7 +28,7 @@ <font> </font> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_newIntroPage</cstring> </property> @@ -39,7 +39,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -63,14 +63,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>98</width> <height>0</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_1</cstring> </property> @@ -84,7 +84,7 @@ <property name="text"> <string>New Loan Account Wizard</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignHCenter</set> </property> </widget> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>119</width> <height>0</height> @@ -107,7 +107,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -117,7 +117,7 @@ Welcome to the New Loan Account Wizard which will guide you through the creation Please make sure that you have the relevant information handy. You usually get the information out of your contract and the last statement.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -131,7 +131,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -140,7 +140,7 @@ Please make sure that you have the relevant information handy. You usually get t </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_editIntroPage</cstring> </property> @@ -151,7 +151,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2_2</cstring> </property> @@ -175,14 +175,14 @@ Please make sure that you have the relevant information handy. You usually get t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>98</width> <height>0</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_1_2</cstring> </property> @@ -196,7 +196,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="text"> <string>Edit Loan Account Wizard</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignHCenter</set> </property> </widget> @@ -210,7 +210,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>119</width> <height>0</height> @@ -219,7 +219,7 @@ Please make sure that you have the relevant information handy. You usually get t </spacer> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2_2</cstring> </property> @@ -229,7 +229,7 @@ Welcome to the Edit Loan Account Wizard. Please use this wizard to modify inform Please make sure that you have the relevant information handy. You usually get the information out of your contract and the last statement.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -243,7 +243,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -252,7 +252,7 @@ Please make sure that you have the relevant information handy. You usually get t </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_newGeneralInfoPage</cstring> </property> @@ -269,7 +269,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -277,7 +277,7 @@ Please make sure that you have the relevant information handy. You usually get t <string> In the first step, KMyMoney will ask you some general information about the loan account to be created.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -291,14 +291,14 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>32</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -322,14 +322,14 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>138</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -343,18 +343,18 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> <property name="text"> <string>1. General Information</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -378,7 +378,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>25</height> @@ -397,7 +397,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>137</width> <height>0</height> @@ -416,7 +416,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>32</height> @@ -425,7 +425,7 @@ In the first step, KMyMoney will ask you some general information about the loan </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_editSelectionPage</cstring> </property> @@ -442,7 +442,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2_1</cstring> </property> @@ -450,7 +450,7 @@ In the first step, KMyMoney will ask you some general information about the loan <string> Please select, which data of the loan you want to modify.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -464,14 +464,14 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>48</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout33</cstring> </property> @@ -495,14 +495,14 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>93</width> <height>0</height> </size> </property> </spacer> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_selectionButtonGroup</cstring> </property> @@ -525,7 +525,7 @@ Please select, which data of the loan you want to modify.</string> <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_editInterestRateButton</cstring> </property> @@ -533,7 +533,7 @@ Please select, which data of the loan you want to modify.</string> <string>Modify the interest rate</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_editOtherCostButton</cstring> </property> @@ -541,7 +541,7 @@ Please select, which data of the loan you want to modify.</string> <string>Modify additional fees</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_editOtherInfoButton</cstring> </property> @@ -561,7 +561,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>108</width> <height>0</height> @@ -580,7 +580,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>47</height> @@ -589,7 +589,7 @@ Please select, which data of the loan you want to modify.</string> </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_effectiveDatePage</cstring> </property> @@ -606,25 +606,25 @@ Please select, which data of the loan you want to modify.</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_effectiveDateLabel</cstring> </property> <property name="text"> <string>1</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_effectiveDateNoteLabel</cstring> </property> <property name="text"> <string>1</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -638,14 +638,14 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>30</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout34</cstring> </property> @@ -659,7 +659,7 @@ Please select, which data of the loan you want to modify.</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_7</cstring> </property> @@ -684,7 +684,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>87</height> @@ -693,7 +693,7 @@ Please select, which data of the loan you want to modify.</string> </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_lendBorrowPage</cstring> </property> @@ -710,7 +710,7 @@ Please select, which data of the loan you want to modify.</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -718,7 +718,7 @@ Please select, which data of the loan you want to modify.</string> <string> Do you borrow or lend money?</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -732,14 +732,14 @@ Do you borrow or lend money?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>61</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout38</cstring> </property> @@ -753,7 +753,7 @@ Do you borrow or lend money?</string> <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -776,7 +776,7 @@ Do you borrow or lend money?</string> <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_borrowButton</cstring> </property> @@ -784,7 +784,7 @@ Do you borrow or lend money?</string> <string>I am borrowing money</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_lendButton</cstring> </property> @@ -804,7 +804,7 @@ Do you borrow or lend money?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>299</width> <height>0</height> @@ -823,7 +823,7 @@ Do you borrow or lend money?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>60</height> @@ -832,7 +832,7 @@ Do you borrow or lend money?</string> </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_namePage</cstring> </property> @@ -843,7 +843,7 @@ Do you borrow or lend money?</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> @@ -851,7 +851,7 @@ Do you borrow or lend money?</string> <string> How do you want to call this loan? Examples for names are 'car loan', 'school loan', 'home owner loan'.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -865,14 +865,14 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>56</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout13</cstring> </property> @@ -886,7 +886,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -911,14 +911,14 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>56</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_generalReceiverText</cstring> </property> @@ -926,15 +926,15 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <string>TextLabel6</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout55</cstring> + <cstring>tqlayout55</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_receiverLabel</cstring> </property> @@ -959,7 +959,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>56</height> @@ -968,7 +968,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_interestTypePage</cstring> </property> @@ -985,7 +985,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5_2</cstring> </property> @@ -993,7 +993,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <string> Is the interest of this loan fixed over a period of time or is it adapted from time to time? If the interest rate changes during the amortization phase of the loan you should choose the option 'variable interest rate'.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1007,14 +1007,14 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>53</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout39</cstring> </property> @@ -1028,7 +1028,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup2</cstring> </property> @@ -1051,7 +1051,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_fixedInterestButton</cstring> </property> @@ -1059,7 +1059,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <string>Fixed interest rate</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_variableInterestButton</cstring> </property> @@ -1079,7 +1079,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>286</width> <height>0</height> @@ -1098,7 +1098,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>53</height> @@ -1107,7 +1107,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_previousPaymentsPage</cstring> </property> @@ -1124,7 +1124,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6_2</cstring> </property> @@ -1132,7 +1132,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <string> Were there any payments for this loan whether they are entered into KMyMoney or not?</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1146,14 +1146,14 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>32</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout40</cstring> </property> @@ -1167,7 +1167,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup3</cstring> </property> @@ -1190,7 +1190,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_noPreviousPaymentButton</cstring> </property> @@ -1198,7 +1198,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <string>No, no payments were made yet.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_previousPaymentButton</cstring> </property> @@ -1218,7 +1218,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>202</width> <height>0</height> @@ -1237,21 +1237,21 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>32</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_3</cstring> </property> <property name="text"> <string>Note: Payments made to obtain the loan (e.g. Dissagio) are not considered as payments in this context.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1265,7 +1265,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>32</height> @@ -1274,7 +1274,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_recordPaymentPage</cstring> </property> @@ -1291,7 +1291,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel7_2</cstring> </property> @@ -1299,7 +1299,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <string> Do you want to record all payments of this loan with KMyMoney?</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1313,14 +1313,14 @@ Do you want to record all payments of this loan with KMyMoney?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>69</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout41</cstring> </property> @@ -1334,7 +1334,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup4</cstring> </property> @@ -1357,7 +1357,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_allPaymentsButton</cstring> </property> @@ -1365,7 +1365,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <string>Yes, record all payments.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_thisYearPaymentButton</cstring> </property> @@ -1385,7 +1385,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>137</width> <height>0</height> @@ -1404,7 +1404,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>69</height> @@ -1413,7 +1413,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_variableInterestDatePage</cstring> </property> @@ -1424,7 +1424,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel8_2</cstring> </property> @@ -1432,7 +1432,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <string> Select the date when the interest rate for this loan will be modified and the frequency of the future changes.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1446,22 +1446,22 @@ Select the date when the interest rate for this loan will be modified and the fr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>99</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout44</cstring> + <cstring>tqlayout44</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -1469,9 +1469,9 @@ Select the date when the interest rate for this loan will be modified and the fr <string>Next interest change on</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout42</cstring> + <cstring>tqlayout42</cstring> </property> <hbox> <property name="name"> @@ -1502,7 +1502,7 @@ Select the date when the interest rate for this loan will be modified and the fr <cstring>m_interestChangeDateEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -1522,7 +1522,7 @@ Select the date when the interest rate for this loan will be modified and the fr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>80</height> @@ -1531,7 +1531,7 @@ Select the date when the interest rate for this loan will be modified and the fr </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_paymentEditPage</cstring> </property> @@ -1548,7 +1548,7 @@ Select the date when the interest rate for this loan will be modified and the fr <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel8_2_2</cstring> </property> @@ -1556,7 +1556,7 @@ Select the date when the interest rate for this loan will be modified and the fr <string> Please enter the amount you pay for principal and interest or leave the field empty to calculate it.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1570,14 +1570,14 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>21</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout39</cstring> </property> @@ -1601,14 +1601,14 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>100</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout35</cstring> </property> @@ -1627,7 +1627,7 @@ Please enter the amount you pay for principal and interest or leave the field em <cstring>m_newPaymentEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2_4</cstring> </property> @@ -1635,7 +1635,7 @@ Please enter the amount you pay for principal and interest or leave the field em <string>Current amount</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_paymentLabel</cstring> </property> @@ -1643,7 +1643,7 @@ Please enter the amount you pay for principal and interest or leave the field em <string>1</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_5</cstring> </property> @@ -1663,7 +1663,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>100</width> <height>0</height> @@ -1682,14 +1682,14 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>19</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4_5</cstring> </property> @@ -1698,13 +1698,13 @@ Please enter the amount you pay for principal and interest or leave the field em If KMyMoney should calculate this value for you, then leave the field blank.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_interestEditPage</cstring> </property> @@ -1721,7 +1721,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5_4</cstring> </property> @@ -1729,7 +1729,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <string> Please enter the interest rate or leave the field empty to calculate it.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1743,14 +1743,14 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>29</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout40</cstring> </property> @@ -1774,14 +1774,14 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout36</cstring> </property> @@ -1800,7 +1800,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <cstring>m_newInterestRateEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_interestRateLabel</cstring> </property> @@ -1808,7 +1808,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <string>1</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel7_3</cstring> </property> @@ -1816,7 +1816,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <string>Current rate</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel6_5</cstring> </property> @@ -1836,7 +1836,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>0</height> @@ -1855,14 +1855,14 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>29</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel9_4</cstring> </property> @@ -1871,13 +1871,13 @@ Please enter the interest rate or leave the field empty to calculate it.</string If KMyMoney should calculate this value for you, then leave the field blank.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_firstPaymentPage</cstring> </property> @@ -1894,14 +1894,14 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_firstPaymentLabel</cstring> </property> <property name="text"> <string>1</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1915,14 +1915,14 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>78</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout22_2</cstring> </property> @@ -1936,7 +1936,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -1961,27 +1961,27 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>28</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_firstPaymentNote</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignBottom</set> </property> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_newCalculateLoanPage</cstring> </property> @@ -1998,7 +1998,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2_2</cstring> </property> @@ -2006,7 +2006,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <string> You have successfully entered the general information about your loan. Next, KMyMoney needs some information about the calculation of the loan.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2020,14 +2020,14 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>19</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout31</cstring> </property> @@ -2051,14 +2051,14 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>136</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout30</cstring> </property> @@ -2072,7 +2072,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_4</cstring> </property> @@ -2082,11 +2082,11 @@ You have successfully entered the general information about your loan. Next, KMy <property name="text"> <string>1. General Information</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4_3_2</cstring> </property> @@ -2095,7 +2095,7 @@ You have successfully entered the general information about your loan. Next, KMy 2. Calculate Loan</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4_3</cstring> </property> @@ -2117,7 +2117,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>18</height> @@ -2136,7 +2136,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>135</width> <height>0</height> @@ -2155,7 +2155,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>23</height> @@ -2164,7 +2164,7 @@ You have successfully entered the general information about your loan. Next, KMy </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_paymentFrequencyPage</cstring> </property> @@ -2181,7 +2181,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel11_2</cstring> </property> @@ -2189,7 +2189,7 @@ You have successfully entered the general information about your loan. Next, KMy <string> How often will there be payments made to this loan?</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2203,14 +2203,14 @@ How often will there be payments made to this loan?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>49</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout33</cstring> </property> @@ -2234,7 +2234,7 @@ How often will there be payments made to this loan?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>39</width> <height>0</height> @@ -2256,7 +2256,7 @@ How often will there be payments made to this loan?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>56</width> <height>0</height> @@ -2275,7 +2275,7 @@ How often will there be payments made to this loan?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>49</height> @@ -2284,7 +2284,7 @@ How often will there be payments made to this loan?</string> </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_interestCalculationPage</cstring> </property> @@ -2301,7 +2301,7 @@ How often will there be payments made to this loan?</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel12_2</cstring> </property> @@ -2309,7 +2309,7 @@ How often will there be payments made to this loan?</string> <string> When does the actual interest rate get calculated?</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2323,14 +2323,14 @@ When does the actual interest rate get calculated?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>69</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout42</cstring> </property> @@ -2344,7 +2344,7 @@ When does the actual interest rate get calculated?</string> <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup5</cstring> </property> @@ -2367,7 +2367,7 @@ When does the actual interest rate get calculated?</string> <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_interestOnReceptionButton</cstring> </property> @@ -2375,7 +2375,7 @@ When does the actual interest rate get calculated?</string> <string>When the payment is received.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_interestOnPaymentButton</cstring> </property> @@ -2395,7 +2395,7 @@ When does the actual interest rate get calculated?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>296</width> <height>0</height> @@ -2414,7 +2414,7 @@ When does the actual interest rate get calculated?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>69</height> @@ -2423,7 +2423,7 @@ When does the actual interest rate get calculated?</string> </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_loanAmountPage</cstring> </property> @@ -2440,14 +2440,14 @@ When does the actual interest rate get calculated?</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_balanceLabel</cstring> </property> <property name="text"> <string>1</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2461,14 +2461,14 @@ When does the actual interest rate get calculated?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>15</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout38</cstring> </property> @@ -2482,7 +2482,7 @@ When does the actual interest rate get calculated?</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel16</cstring> </property> @@ -2497,7 +2497,7 @@ When does the actual interest rate get calculated?</string> </widget> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3</cstring> </property> @@ -2517,62 +2517,62 @@ When does the actual interest rate get calculated?</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> <property name="text"> <string>Loan amount:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel8</cstring> </property> <property name="text"> <string>Interest rate:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel9</cstring> </property> <property name="text"> <string>Term:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel10</cstring> </property> <property name="text"> <string>Principal + Interest:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel11</cstring> </property> <property name="text"> <string>Final amortization payment</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_loanAmount1</cstring> </property> @@ -2588,7 +2588,7 @@ When does the actual interest rate get calculated?</string> <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_interestRate1</cstring> </property> @@ -2604,7 +2604,7 @@ When does the actual interest rate get calculated?</string> <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_duration1</cstring> </property> @@ -2620,7 +2620,7 @@ When does the actual interest rate get calculated?</string> <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>m_payment1</cstring> </property> @@ -2636,7 +2636,7 @@ When does the actual interest rate get calculated?</string> <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>m_balloon1</cstring> </property> @@ -2656,7 +2656,7 @@ When does the actual interest rate get calculated?</string> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_interestPage</cstring> </property> @@ -2673,7 +2673,7 @@ When does the actual interest rate get calculated?</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel14_2</cstring> </property> @@ -2681,7 +2681,7 @@ When does the actual interest rate get calculated?</string> <string> Please enter the interest rate or leave the field empty to calculate it.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2695,14 +2695,14 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout36</cstring> </property> @@ -2716,7 +2716,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_4</cstring> </property> @@ -2731,7 +2731,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string </widget> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3_2</cstring> </property> @@ -2751,62 +2751,62 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel6_3</cstring> </property> <property name="text"> <string>Loan amount:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel8_3</cstring> </property> <property name="text"> <string>Interest rate:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel9_2</cstring> </property> <property name="text"> <string>Term:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel10_2</cstring> </property> <property name="text"> <string>Principal + Interest:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel11_3</cstring> </property> <property name="text"> <string>Final amortization payment</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_loanAmount2</cstring> </property> @@ -2822,7 +2822,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_interestRate2</cstring> </property> @@ -2838,7 +2838,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_duration2</cstring> </property> @@ -2854,7 +2854,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>m_payment2</cstring> </property> @@ -2870,7 +2870,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>m_balloon2</cstring> </property> @@ -2890,7 +2890,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_durationPage</cstring> </property> @@ -2901,7 +2901,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel15_2</cstring> </property> @@ -2909,7 +2909,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <string> Please enter the term of this loan or leave the field empty to calculate it. The term is the time that is required to fully repay the loan. This time might be different from the time your loan contract is signed for.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2923,22 +2923,22 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>54</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout43</cstring> + <cstring>tqlayout43</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_3</cstring> </property> @@ -2966,7 +2966,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The </widget> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3_2_2</cstring> </property> @@ -2986,62 +2986,62 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel6_3_2</cstring> </property> <property name="text"> <string>Loan amount:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel8_3_2</cstring> </property> <property name="text"> <string>Interest rate:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel9_2_2</cstring> </property> <property name="text"> <string>Term:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel10_2_2</cstring> </property> <property name="text"> <string>Principal + Interest:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel11_3_2</cstring> </property> <property name="text"> <string>Final amortization payment</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_loanAmount3</cstring> </property> @@ -3057,7 +3057,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_interestRate3</cstring> </property> @@ -3073,7 +3073,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_duration3</cstring> </property> @@ -3089,7 +3089,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>m_payment3</cstring> </property> @@ -3105,7 +3105,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>m_balloon3</cstring> </property> @@ -3125,7 +3125,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_paymentPage</cstring> </property> @@ -3142,7 +3142,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel16_2</cstring> </property> @@ -3150,7 +3150,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <string> Please enter the amount you pay for principal and interest or leave the field empty to calculate it.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -3164,14 +3164,14 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout36_2</cstring> </property> @@ -3185,7 +3185,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_4_2</cstring> </property> @@ -3200,7 +3200,7 @@ Please enter the amount you pay for principal and interest or leave the field em </widget> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3_2_2_2</cstring> </property> @@ -3220,62 +3220,62 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel6_3_2_2</cstring> </property> <property name="text"> <string>Loan amount:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel8_3_2_2</cstring> </property> <property name="text"> <string>Interest rate:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel9_2_2_2</cstring> </property> <property name="text"> <string>Term:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel10_2_2_2</cstring> </property> <property name="text"> <string>Principal + Interest:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel11_3_2_2</cstring> </property> <property name="text"> <string>Final amortization payment</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_loanAmount4</cstring> </property> @@ -3291,7 +3291,7 @@ Please enter the amount you pay for principal and interest or leave the field em <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_interestRate4</cstring> </property> @@ -3307,7 +3307,7 @@ Please enter the amount you pay for principal and interest or leave the field em <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_duration4</cstring> </property> @@ -3323,7 +3323,7 @@ Please enter the amount you pay for principal and interest or leave the field em <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>m_payment4</cstring> </property> @@ -3339,7 +3339,7 @@ Please enter the amount you pay for principal and interest or leave the field em <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>m_balloon4</cstring> </property> @@ -3359,7 +3359,7 @@ Please enter the amount you pay for principal and interest or leave the field em </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_finalPaymentPage</cstring> </property> @@ -3376,7 +3376,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel17_2</cstring> </property> @@ -3384,7 +3384,7 @@ Please enter the amount you pay for principal and interest or leave the field em <string> Please enter the amount of a final amortization payment or leave the field empty to calculate it.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -3398,14 +3398,14 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout44</cstring> </property> @@ -3419,7 +3419,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_4_2_2</cstring> </property> @@ -3434,7 +3434,7 @@ Please enter the amount of a final amortization payment or leave the field empty </widget> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3_2_2_2_2</cstring> </property> @@ -3454,62 +3454,62 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel6_3_2_2_2</cstring> </property> <property name="text"> <string>Loan amount:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel8_3_2_2_2</cstring> </property> <property name="text"> <string>Interest rate:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel9_2_2_2_2</cstring> </property> <property name="text"> <string>Term:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel10_2_2_2_2</cstring> </property> <property name="text"> <string>Principal + Interest:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel11_3_2_2_2</cstring> </property> <property name="text"> <string>Final amortization payment</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_loanAmount5</cstring> </property> @@ -3525,7 +3525,7 @@ Please enter the amount of a final amortization payment or leave the field empty <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_interestRate5</cstring> </property> @@ -3541,7 +3541,7 @@ Please enter the amount of a final amortization payment or leave the field empty <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_duration5</cstring> </property> @@ -3557,7 +3557,7 @@ Please enter the amount of a final amortization payment or leave the field empty <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>m_payment5</cstring> </property> @@ -3573,7 +3573,7 @@ Please enter the amount of a final amortization payment or leave the field empty <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>m_balloon5</cstring> </property> @@ -3593,7 +3593,7 @@ Please enter the amount of a final amortization payment or leave the field empty </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_calculationOverviewPage</cstring> </property> @@ -3610,7 +3610,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel18_2</cstring> </property> @@ -3618,7 +3618,7 @@ Please enter the amount of a final amortization payment or leave the field empty <string> KMyMoney has calculated the loan as shown in the overview below. You can accept these values by selecting "Next" or change them by choosing "Back" to return to the input field for the information you want to change.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -3632,14 +3632,14 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>22</height> </size> </property> </spacer> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3_2_2_2_2_2</cstring> </property> @@ -3659,62 +3659,62 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel6_3_2_2_2_2</cstring> </property> <property name="text"> <string>Loan amount:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel8_3_2_2_2_2</cstring> </property> <property name="text"> <string>Interest rate:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel9_2_2_2_2_2</cstring> </property> <property name="text"> <string>Term:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel10_2_2_2_2_2</cstring> </property> <property name="text"> <string>Principal + Interest:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel11_3_2_2_2_2</cstring> </property> <property name="text"> <string>Final amortization payment</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_loanAmount6</cstring> </property> @@ -3730,7 +3730,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_interestRate6</cstring> </property> @@ -3746,7 +3746,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_duration6</cstring> </property> @@ -3762,7 +3762,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>m_payment6</cstring> </property> @@ -3778,7 +3778,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>m_balloon6</cstring> </property> @@ -3798,7 +3798,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_newPaymentsPage</cstring> </property> @@ -3815,7 +3815,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel19_2</cstring> </property> @@ -3823,7 +3823,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <string> In the following steps, KMyMoney supports you in setting up categories and schedules for your loan payments.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -3837,14 +3837,14 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>14</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout31_2</cstring> </property> @@ -3868,14 +3868,14 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>136</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout30_2</cstring> </property> @@ -3889,7 +3889,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel19_3</cstring> </property> @@ -3899,11 +3899,11 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="text"> <string>1. General Information</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel19_4</cstring> </property> @@ -3915,7 +3915,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched 2. Calculate Loan</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel19_5</cstring> </property> @@ -3937,7 +3937,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>18</height> @@ -3956,7 +3956,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>135</width> <height>0</height> @@ -3975,7 +3975,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>18</height> @@ -3984,7 +3984,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_interestCategoryPage</cstring> </property> @@ -4001,7 +4001,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel20_2</cstring> </property> @@ -4009,7 +4009,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <string> Please select the category you want to assign the interest payments to or create a new category.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4023,7 +4023,7 @@ Please select the category you want to assign the interest payments to or create <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>38</height> @@ -4035,7 +4035,7 @@ Please select the category you want to assign the interest payments to or create <cstring>m_interestAccountEdit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout29</cstring> </property> @@ -4059,7 +4059,7 @@ Please select the category you want to assign the interest payments to or create <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>264</width> <height>0</height> @@ -4086,7 +4086,7 @@ Please select the category you want to assign the interest payments to or create <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>22</height> @@ -4095,7 +4095,7 @@ Please select the category you want to assign the interest payments to or create </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_additionalFeesPage</cstring> </property> @@ -4112,7 +4112,7 @@ Please select the category you want to assign the interest payments to or create <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel21_2</cstring> </property> @@ -4120,7 +4120,7 @@ Please select the category you want to assign the interest payments to or create <string> If your regular payment contains any additional fees, click on the button "Additional fees" to enter them.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4134,14 +4134,14 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>16</height> </size> </property> </spacer> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame9</cstring> </property> @@ -4161,18 +4161,18 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>TextLabel21_1_3</cstring> </property> <property name="text"> <string>= periodical payment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>m_periodicPayment</cstring> </property> @@ -4187,11 +4187,11 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>m_additionalCost</cstring> </property> @@ -4206,11 +4206,11 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout63</cstring> </property> @@ -4224,14 +4224,14 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel21_1_2</cstring> </property> <property name="text"> <string>+</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4245,7 +4245,7 @@ If your regular payment contains any additional fees, click on the button "Addit </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>m_basePayment</cstring> </property> @@ -4260,18 +4260,18 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>TextLabel21_1</cstring> </property> <property name="text"> <string>Principal + Interest:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4285,7 +4285,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -4302,7 +4302,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -4321,21 +4321,21 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel21_2_2</cstring> </property> <property name="text"> <string>If no additional fees are included in your periodical payment or you have entered all such fees, then click on "Next".</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4349,7 +4349,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>16</height> @@ -4358,7 +4358,7 @@ If your regular payment contains any additional fees, click on the button "Addit </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_schedulePage</cstring> </property> @@ -4375,7 +4375,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel22_2</cstring> </property> @@ -4383,7 +4383,7 @@ If your regular payment contains any additional fees, click on the button "Addit <string>KMyMoney will create a schedule for this payment and reminds you whenever a payment must be made.<p> If you selected to record all payments this date has already been supplied. If you selected to record only this years payments, then the <b>First payment due date</b> is the date of the first payment made in this year.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4397,14 +4397,14 @@ If you selected to record all payments this date has already been supplied. If y <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>23</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout49</cstring> </property> @@ -4428,7 +4428,7 @@ If you selected to record all payments this date has already been supplied. If y <cstring>m_nextDueDateEdit</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_dueLabel</cstring> </property> @@ -4436,14 +4436,14 @@ If you selected to record all payments this date has already been supplied. If y <string>First payment due on:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2_5</cstring> </property> <property name="text"> <string>Make payment from/to:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -4459,7 +4459,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>24</height> @@ -4468,7 +4468,7 @@ If you selected to record all payments this date has already been supplied. If y </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_summaryEditPage</cstring> </property> @@ -4485,7 +4485,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel10_4</cstring> </property> @@ -4493,7 +4493,7 @@ If you selected to record all payments this date has already been supplied. If y <string> KMyMoney has calculated the loan as shown below. If you want to accept these values use the "Finish" button to update your account, otherwise use the "Back" button to modify your settings.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4507,14 +4507,14 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>23</height> </size> </property> </spacer> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3_2_2_2_2_2_2</cstring> </property> @@ -4534,73 +4534,73 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel6_3_2_2_2_2_2</cstring> </property> <property name="text"> <string>Principal + Interest:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel8_3_2_2_2_2_2</cstring> </property> <property name="text"> <string>Additional fees:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel9_2_2_2_2_2_2</cstring> </property> <property name="text"> <string>Total payment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel10_2_2_2_2_2_2</cstring> </property> <property name="text"> <string>Interest rate:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel11_3_2_2_2_2_2</cstring> </property> <property name="text"> <string>Valid from:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>TextLabel11_3_2_2_2_2_2_2</cstring> </property> <property name="text"> <string>Affected payments:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_payment7</cstring> </property> @@ -4616,7 +4616,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_additionalFees7</cstring> </property> @@ -4632,7 +4632,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_totalPayment7</cstring> </property> @@ -4648,7 +4648,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>m_interestRate7</cstring> </property> @@ -4664,7 +4664,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>m_startDateChanges</cstring> </property> @@ -4680,7 +4680,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>m_affectedPayments</cstring> </property> @@ -4700,7 +4700,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_assetAccountPage</cstring> </property> @@ -4711,7 +4711,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel10_4_2</cstring> </property> @@ -4719,7 +4719,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <string>If this loan is for an asset, such as a car or a house, you can create the asset account now. An asset account represents the total value of an asset. The money from this loan will be transfered into the asset account you create or select. If this loan is a 'consumer loan' (money to use however you want), you can use a checking account instead.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4733,14 +4733,14 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_dontCreatePayoutCheckBox</cstring> </property> @@ -4748,9 +4748,9 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <string>Don't create payout transaction</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout124</cstring> + <cstring>tqlayout124</cstring> </property> <vbox> <property name="name"> @@ -4761,9 +4761,9 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <cstring>m_assetAccountEdit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout123</cstring> + <cstring>tqlayout123</cstring> </property> <hbox> <property name="name"> @@ -4779,7 +4779,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>466</width> <height>20</height> @@ -4804,15 +4804,15 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout170</cstring> + <cstring>tqlayout170</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -4837,7 +4837,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -4846,7 +4846,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_summaryPage</cstring> </property> @@ -4863,7 +4863,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel22_2_2</cstring> </property> @@ -4871,7 +4871,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <string> This page summarizes the data you entered. If you need to modify anything, please use the "Back" button to go to respective page. Otherwise use the "Finish" button to create the account.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4885,14 +4885,14 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout61</cstring> </property> @@ -4906,7 +4906,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout60</cstring> </property> @@ -4920,7 +4920,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -4937,7 +4937,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="spacing"> <number>1</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout52</cstring> </property> @@ -4951,18 +4951,18 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="spacing"> <number>1</number> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel5_3</cstring> </property> <property name="text"> <string>Payee:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_summaryLoanType</cstring> </property> @@ -4978,7 +4978,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_summaryPayee</cstring> </property> @@ -4994,18 +4994,18 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel4_4</cstring> </property> <property name="text"> <string>First payment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_summaryFirstPayment</cstring> </property> @@ -5021,14 +5021,14 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel3_5</cstring> </property> <property name="text"> <string>Amount is:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5036,7 +5036,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -5053,7 +5053,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="spacing"> <number>1</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout57</cstring> </property> @@ -5067,7 +5067,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="spacing"> <number>1</number> </property> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>m_summaryTotalPeriodicPayment</cstring> </property> @@ -5083,7 +5083,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>m_summaryPaymentAccount</cstring> </property> @@ -5099,7 +5099,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_summaryAdditionalFees</cstring> </property> @@ -5115,51 +5115,51 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel15</cstring> </property> <property name="text"> <string>Periodic Payment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="1" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>TextLabel14</cstring> </property> <property name="text"> <string>Additional Fees:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel13</cstring> </property> <property name="text"> <string>Interest category:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>TextLabel17</cstring> </property> <property name="text"> <string>Payment from:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>m_summaryInterestCategory</cstring> </property> @@ -5175,7 +5175,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>m_summaryNextPayment</cstring> </property> @@ -5191,14 +5191,14 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel16_3</cstring> </property> <property name="text"> <string>Next due date:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5208,7 +5208,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -5225,7 +5225,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="spacing"> <number>1</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout59</cstring> </property> @@ -5239,7 +5239,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="spacing"> <number>1</number> </property> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>m_summaryInterestRate</cstring> </property> @@ -5255,18 +5255,18 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel10_3</cstring> </property> <property name="text"> <string>Term:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>m_summaryPeriodicPayment</cstring> </property> @@ -5282,18 +5282,18 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel9_3</cstring> </property> <property name="text"> <string>Interest rate:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_summaryPaymentFrequency</cstring> </property> @@ -5309,18 +5309,18 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>TextLabel12</cstring> </property> <property name="text"> <string>Final Payment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>m_summaryTerm</cstring> </property> @@ -5336,18 +5336,18 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel6_4</cstring> </property> <property name="text"> <string>Interest is due:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_summaryAmount</cstring> </property> @@ -5363,18 +5363,18 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>TextLabel11_4</cstring> </property> <property name="text"> <string>Principal + Interest:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="6" column="1"> + <widget class="TQLabel" row="6" column="1"> <property name="name"> <cstring>m_summaryBalloonPayment</cstring> </property> @@ -5390,29 +5390,29 @@ This page summarizes the data you entered. If you need to modify anything, pleas <enum>PlainText</enum> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel8_4</cstring> </property> <property name="text"> <string>Loan amount:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel7</cstring> </property> <property name="text"> <string>Payment frequency:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>m_summaryInterestDue</cstring> </property> @@ -5444,7 +5444,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>16</height> @@ -5493,5 +5493,10 @@ This page summarizes the data you entered. If you need to modify anything, pleas <data format="PNG" length="1110">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000041d49444154388d8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d09a6c508138cb8c13d647141163de49043bca9f1628eb9294810f24f88c15b728b07617358888785d980427290b4a8d00b19a8821da8228cf42316ac87eed9247ac95c9aeaeef9eaabdffb5ebf85f178ccfcf7f5b79fec07a7280a08a008f25ceb7c29e5da573716e65a0be3f198ef6f5ededff9b9e1b34faf90882092a1ea21428b9220ffbf46054055b19386ba6970ae6665b5e0d2c5eb0b066067bbe1f21757c88f5504eff0c192189081303a5582b16854fccce2fe041f00cdd0a8103b874556405476b62d972ec2c2b90ff3fd8df5cb946549d80b34aea15ccaa94625450e2d0e558b460b7371a734b5e027251a155545678ab62d7eea90b4c504078908c107acb354cb251b1f8f08b1c18631aabbb4d18211404804f22545863561d2f060fb34aa8a18d0086204e72c46a32292e1a796f278c1da7a859d8da9a737506db04d0a24103d8949480b214d3bbee952a05c1d536f9d2684160c744f048311543d459eb1b65ee1754cedae13a64abd5d6127053c9d0281f22d4f75c6a2118a5c09272d7ab740638bf4ef2dd2174032d0d8d04c6fe19c32bedd8bc65e342aa3f785e2784bfd6bc1bd9db24b05505616a4edd67d5a8c1801a03a9962754c504bf34b8986acfb9be91cac7d54315a15541b36b134f74bd2dc53940115a5381e087bc25c6f71be831a8baa234cc1ee3eeb74ed83116beb2b8849d108a3730e8ce27e2bfb82419a7b407ac7c222fd0e6280a8078ce64e47ef54ac9d5be9aaae0162e0de568a44a18d3df90845d919c4f01463406340a44f40efb43a99b371618488e2670d1a2d7ee6f1d3be39342104e937ed85fb86599c33e9ee0be9a004946259d8b858909880d59aa00daa0d3280b5f39e34074c4b3a5434029a76a9e9f5cc0163b5c80024158a1cfc4cb1d3061d5834066cb0a403c008599a70f6bc27b8d03106ea3ae91987278c5b143b015547224ab5e24185cd9b81665273e7b6e7cecd82ddbf8098002de94049737bc09828cf3036f31c3735c8b0e98eb704672f348c7f7c93cd1fb2ae905119ff54e0dff3542b0e9dd983dcea2cc5eea6cf303e74ec687af5c41b6fa38f5e203c7ec8e1238ef85831a214afef21060ea781ec68247b65c6916353cc8b73d1ae79354606af2a930709aa118da1636c274dd7e3774b884a79aa6b5711a538d33cf9c01c1c9b83bc6a1f55c91ccb23b05b1deb43a7decdaffefd2862f61366aa8449c69e33642f012f2bb208fa98eeda1f3346f076c8eeef19475e9be115423364f78f84105a8643d34d90cfbfdcd8cf872589a45dc7f54cf3134a36f4e495c23f9da8db15bccb708d4014f2ca512cb5d4f7c13e84300d5cff6eb39b202bab053bdb9674f0648609427d0f8402ddeac30f4fcd3ced3efc3b422d406c09b340bedc1571e1bfc3d44dc281634c5fe5e758e7395cfbe6d6c130fd17d92372d277c159b70000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui b/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui index 0ca2d14..748d343 100644 --- a/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui +++ b/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>kOnlineQuoteConfigurationDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>kOnlineQuoteConfigurationDecl</cstring> </property> @@ -18,7 +18,7 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -40,7 +40,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -64,14 +64,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -88,7 +88,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -104,7 +104,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -120,7 +120,7 @@ <string>Perl Location:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -195,5 +195,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp b/kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp index 8503d5a..d479c81 100644 --- a/kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp +++ b/kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp @@ -18,9 +18,9 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlabel.h> -#include <qpushbutton.h> -#include <qradiobutton.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -38,7 +38,7 @@ #include "konlinequoteconfigurationdlg.h" -KOnlineQuoteConfigurationDlg::KOnlineQuoteConfigurationDlg(QWidget *parent) : kOnlineQuoteConfigurationDecl(parent) +KOnlineQuoteConfigurationDlg::KOnlineQuoteConfigurationDlg(TQWidget *tqparent) : kOnlineQuoteConfigurationDecl(tqparent) { } diff --git a/kmymoney2/dialogs/konlinequoteconfigurationdlg.h b/kmymoney2/dialogs/konlinequoteconfigurationdlg.h index f6ea139..7a9eb65 100644 --- a/kmymoney2/dialogs/konlinequoteconfigurationdlg.h +++ b/kmymoney2/dialogs/konlinequoteconfigurationdlg.h @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#ifndef KONLINEQUOTECONFIGURATIONDIALOG_H -#define KONLINEQUOTECONFIGURATIONDIALOG_H +#ifndef KONLINETQUOTECONFIGURATIONDIALOG_H +#define KONLINETQUOTECONFIGURATIONDIALOG_H // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> +#include <tqwidget.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -40,8 +40,9 @@ class KOnlineQuoteConfigurationDlg : public kOnlineQuoteConfigurationDecl { Q_OBJECT + TQ_OBJECT public: - KOnlineQuoteConfigurationDlg(QWidget *parent); + KOnlineQuoteConfigurationDlg(TQWidget *tqparent); ~KOnlineQuoteConfigurationDlg(); }; diff --git a/kmymoney2/dialogs/kpayeereassigndlg.cpp b/kmymoney2/dialogs/kpayeereassigndlg.cpp index 0ed8a5a..dc03518 100644 --- a/kmymoney2/dialogs/kpayeereassigndlg.cpp +++ b/kmymoney2/dialogs/kpayeereassigndlg.cpp @@ -36,12 +36,12 @@ #include <kmymoney/kmymoneycombo.h> #include <kmymoney/kguiutils.h> -KPayeeReassignDlg::KPayeeReassignDlg( QWidget* parent, const char* name) : - KPayeeReassignDlgDecl( parent, name) +KPayeeReassignDlg::KPayeeReassignDlg( TQWidget* tqparent, const char* name) : + KPayeeReassignDlgDecl( tqparent, name) { buttonOk->setGuiItem(KStdGuiItem::ok()); buttonCancel->setGuiItem(KStdGuiItem::cancel()); - kMandatoryFieldGroup* mandatory = new kMandatoryFieldGroup(this); + kMandatoryFieldGroup* mandatory = new kMandatoryFieldGroup(TQT_TQOBJECT(this)); mandatory->add(payeeCombo); mandatory->setOkButton(buttonOk); } @@ -50,16 +50,16 @@ KPayeeReassignDlg::~KPayeeReassignDlg() { } -QString KPayeeReassignDlg::show(const QValueList<MyMoneyPayee>& payeeslist) +TQString KPayeeReassignDlg::show(const TQValueList<MyMoneyPayee>& payeeslist) { if (payeeslist.isEmpty()) - return QString(); // no payee available? nothing can be selected... + return TQString(); // no payee available? nothing can be selected... payeeCombo->loadPayees(payeeslist); // execute dialog and if aborted, return empty string - if (this->exec() == QDialog::Rejected) - return QString(); + if (this->exec() == TQDialog::Rejected) + return TQString(); // otherwise return index of selected payee return payeeCombo->selectedItem(); diff --git a/kmymoney2/dialogs/kpayeereassigndlg.h b/kmymoney2/dialogs/kpayeereassigndlg.h index 3edab86..f0f21ac 100644 --- a/kmymoney2/dialogs/kpayeereassigndlg.h +++ b/kmymoney2/dialogs/kpayeereassigndlg.h @@ -23,8 +23,8 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qvaluelist.h> -#include <qcheckbox.h> +#include <tqvaluelist.h> +#include <tqcheckbox.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -42,9 +42,10 @@ class KPayeeReassignDlg : public KPayeeReassignDlgDecl { Q_OBJECT + TQ_OBJECT public: /** Default constructor */ - KPayeeReassignDlg( QWidget* parent = 0, const char* name = 0); + KPayeeReassignDlg( TQWidget* tqparent = 0, const char* name = 0); /** Destructor */ ~KPayeeReassignDlg(); @@ -53,12 +54,12 @@ public: * This function sets up the dialog, lets the user select a payee and returns * the id of the selected payee in the payeeslist. * - * @param payeeslist reference to QValueList of MyMoneyPayee objects to be contained in the list + * @param payeeslist reference to TQValueList of MyMoneyPayee objects to be contained in the list * - * @return Returns the id of the selected payee in the list or QString() if - * the dialog was aborted. QString() is also returned if the payeeslist is empty. + * @return Returns the id of the selected payee in the list or TQString() if + * the dialog was aborted. TQString() is also returned if the payeeslist is empty. */ - QString show(const QValueList<MyMoneyPayee>& payeeslist); + TQString show(const TQValueList<MyMoneyPayee>& payeeslist); /** * Returns true, if the names of the payees to be deleted should be copied diff --git a/kmymoney2/dialogs/kpayeereassigndlgdecl.ui b/kmymoney2/dialogs/kpayeereassigndlgdecl.ui index a968709..1f85b76 100644 --- a/kmymoney2/dialogs/kpayeereassigndlgdecl.ui +++ b/kmymoney2/dialogs/kpayeereassigndlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KPayeeReassignDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KPayeeReassignDlgDecl</cstring> </property> @@ -25,11 +25,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>0</height> @@ -38,7 +38,7 @@ <property name="text"> <string>The transactions associated with the selected payees need to be re-assigned to a different payee before the selected payees can be deleted. Please select a payee from the list below.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> @@ -52,14 +52,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -82,14 +82,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_copyToMatchList</cstring> </property> @@ -114,9 +114,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>305</width> <height>20</height> @@ -182,5 +182,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kplugindlg.ui b/kmymoney2/dialogs/kplugindlg.ui index 33a6f88..19d7f03 100644 --- a/kmymoney2/dialogs/kplugindlg.ui +++ b/kmymoney2/dialogs/kplugindlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KPluginDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KPluginDlg</cstring> </property> @@ -36,7 +36,7 @@ </column> <column> <property name="text"> - <string>Status</string> + <string>tqStatus</string> </property> <property name="clickable"> <bool>true</bool> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>180</width> <height>20</height> @@ -150,5 +150,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/krecentfileitem.cpp b/kmymoney2/dialogs/krecentfileitem.cpp index 679078d..dfcb0b8 100644 --- a/kmymoney2/dialogs/krecentfileitem.cpp +++ b/kmymoney2/dialogs/krecentfileitem.cpp @@ -23,10 +23,10 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qtooltip.h> -#include <qwidget.h> -#include <qrect.h> -#include <qpoint.h> +#include <tqtooltip.h> +#include <tqwidget.h> +#include <tqrect.h> +#include <tqpoint.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -37,12 +37,12 @@ #include "krecentfileitem.h" -KRecentFileItem::KRecentFileItem(const QString& url, QIconView* parent, const QString& text, const QPixmap& icon) - : QIconViewItem(parent, text, icon), +KRecentFileItem::KRecentFileItem(const TQString& url, TQIconView* tqparent, const TQString& text, const TQPixmap& icon) + : TQIconViewItem(tqparent, text, icon), m_url(url), - m_parent(parent) + m_parent(tqparent) { - QToolTip::add(parent, rect(), url); + TQToolTip::add(tqparent, rect(), url); // avoid moving this item around setDragEnabled(false); } @@ -53,10 +53,10 @@ KRecentFileItem::~KRecentFileItem() bool KRecentFileItem::move( int x, int y ) { - QRect r = rect(); - QToolTip::remove(m_parent, rect()); - r.moveTopLeft(QPoint(x,y)); - QToolTip::add(m_parent, r, m_url); - return QIconViewItem::move(x,y); + TQRect r = rect(); + TQToolTip::remove(m_parent, rect()); + r.moveTopLeft(TQPoint(x,y)); + TQToolTip::add(m_parent, r, m_url); + return TQIconViewItem::move(x,y); } diff --git a/kmymoney2/dialogs/krecentfileitem.h b/kmymoney2/dialogs/krecentfileitem.h index bb88cba..1859c96 100644 --- a/kmymoney2/dialogs/krecentfileitem.h +++ b/kmymoney2/dialogs/krecentfileitem.h @@ -24,8 +24,8 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> -#include <qiconview.h> +#include <tqwidget.h> +#include <tqiconview.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -40,17 +40,17 @@ * @author Michael Edwardes */ -class KRecentFileItem : public QIconViewItem { +class KRecentFileItem : public TQIconViewItem { public: - KRecentFileItem(const QString& url, QIconView* parent, const QString& text, const QPixmap& icon); + KRecentFileItem(const TQString& url, TQIconView* tqparent, const TQString& text, const TQPixmap& icon); ~KRecentFileItem(); - QString fileURL(void) const { return m_url; } + TQString fileURL(void) const { return m_url; } bool move( int x, int y ); private: - QString m_url; - QWidget* m_parent; + TQString m_url; + TQWidget* m_parent; }; #endif diff --git a/kmymoney2/dialogs/kreconciledlg.cpp b/kmymoney2/dialogs/kreconciledlg.cpp index 75e7b48..f7911b2 100644 --- a/kmymoney2/dialogs/kreconciledlg.cpp +++ b/kmymoney2/dialogs/kreconciledlg.cpp @@ -17,24 +17,20 @@ #include <kmessagebox.h> #include <kglobal.h> #include <klocale.h> -#if QT_VERSION > 300 #include <kstandarddirs.h> -#else -#include <kstddirs.h> -#endif #include "kreconciledlg.h" KReconcileDlg::KReconcileDlg(const MyMoneyMoney /* previousBal */, const MyMoneyMoney /* endingBal */, - const QDate /* endingDate */, MyMoneyAccount* /*accountIndex */, - const MyMoneyFile* /* file */, QWidget *parent, const char *name) - : KReconcileDlgDecl(parent,name,true) + const TQDate /* endingDate */, MyMoneyAccount* /*accountIndex */, + const MyMoneyFile* /* file */, TQWidget *tqparent, const char *name) + : KReconcileDlgDecl(tqparent,name,true) { /* m_balanced = false; - m_debitsQList.setAutoDelete(false); - m_creditsQList.setAutoDelete(false); + m_debitsTQList.setAutoDelete(false); + m_creditsTQList.setAutoDelete(false); m_reconciledTransactions.setAutoDelete(false); m_file = file; @@ -47,11 +43,11 @@ KReconcileDlg::KReconcileDlg(const MyMoneyMoney /* previousBal */, const MyMoney m_endingDate = endingDate; - totalCreditsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - totalDebitsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - previousLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - endingLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - differenceLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + totalCreditsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + totalDebitsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + previousLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + endingLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + differenceLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); debitListView->setRootIsDecorated(false); @@ -63,7 +59,7 @@ KReconcileDlg::KReconcileDlg(const MyMoneyMoney /* previousBal */, const MyMoney debitListView->setMultiSelection(true); debitListView->setAllColumnsShowFocus(true); // never show a horizontal scroll bar - debitListView->setHScrollBarMode(QScrollView::AlwaysOff); + debitListView->setHScrollBarMode(TQScrollView::AlwaysOff); creditListView->setRootIsDecorated(false); creditListView->addColumn(i18n("Date")); @@ -74,7 +70,7 @@ KReconcileDlg::KReconcileDlg(const MyMoneyMoney /* previousBal */, const MyMoney creditListView->setMultiSelection(true); creditListView->setAllColumnsShowFocus(true); // never show a horizontal scroll bar - creditListView->setHScrollBarMode(QScrollView::AlwaysOff); + creditListView->setHScrollBarMode(TQScrollView::AlwaysOff); endingLabel->setText(KGlobal::locale()->formatMoney(m_clearedBalance.amount(),"")); @@ -90,11 +86,11 @@ KReconcileDlg::KReconcileDlg(const MyMoneyMoney /* previousBal */, const MyMoney loadLists(); insertTransactions(); - connect(debitListView, SIGNAL(clicked(QListViewItem*, const QPoint&, int)), this, SLOT(slotDebitSelected(QListViewItem*, const QPoint&, int))); - connect(creditListView, SIGNAL(clicked(QListViewItem*, const QPoint&, int)), this, SLOT(slotCreditSelected(QListViewItem*, const QPoint&, int))); - connect(buttonCancel, SIGNAL(clicked()), this, SLOT(cancelClicked())); - connect(buttonOk, SIGNAL(clicked()), this, SLOT(finishClicked())); - connect(buttonEdit, SIGNAL(clicked()), this, SLOT(editClicked())); + connect(debitListView, TQT_SIGNAL(clicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotDebitSelected(TQListViewItem*, const TQPoint&, int))); + connect(creditListView, TQT_SIGNAL(clicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotCreditSelected(TQListViewItem*, const TQPoint&, int))); + connect(buttonCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(cancelClicked())); + connect(buttonOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(finishClicked())); + connect(buttonEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editClicked())); doDifference(); */ @@ -108,14 +104,14 @@ void KReconcileDlg::clearReconcile() { /* MyMoneyTransaction *temp_transaction; - for(temp_transaction = m_creditsQList.first();temp_transaction;temp_transaction = m_creditsQList.next()) + for(temp_transaction = m_creditsTQList.first();temp_transaction;temp_transaction = m_creditsTQList.next()) { if(temp_transaction->state() == MyMoneyTransaction::Reconciled) { temp_transaction->setState(MyMoneyTransaction::Unreconciled); } } - for(temp_transaction = m_debitsQList.first();temp_transaction;temp_transaction = m_debitsQList.next()) + for(temp_transaction = m_debitsTQList.first();temp_transaction;temp_transaction = m_debitsTQList.next()) { if(temp_transaction->state() == MyMoneyTransaction::Reconciled) { @@ -129,8 +125,8 @@ void KReconcileDlg::loadLists(void) { /* // Load the internal transaaction lists - m_creditsQList.clear(); - m_debitsQList.clear(); + m_creditsTQList.clear(); + m_debitsTQList.clear(); unsigned int i=0; MyMoneyTransaction *transaction; @@ -141,11 +137,11 @@ void KReconcileDlg::loadLists(void) if (transaction->state()!=MyMoneyTransaction::Reconciled) { if (transaction->type() == MyMoneyTransaction::Debit) { transaction->setIndex(i); - m_debitsQList.append(transaction); + m_debitsTQList.append(transaction); } else { transaction->setIndex(i); - m_creditsQList.append(transaction); + m_creditsTQList.append(transaction); } } } @@ -159,12 +155,12 @@ void KReconcileDlg::insertTransactions(void) creditListView->clear(); debitListView->clear(); - QListIterator<MyMoneyTransaction> it(m_debitsQList); + TQListIterator<MyMoneyTransaction> it(m_debitsTQList); for ( ; it.current(); ++it) { (void) new KReconcileListItem(debitListView, it.current()); } - QListIterator<MyMoneyTransaction> it2(m_creditsQList); + TQListIterator<MyMoneyTransaction> it2(m_creditsTQList); for ( ; it2.current(); ++it2) { (void) new KReconcileListItem(creditListView, it2.current()); } @@ -173,7 +169,7 @@ void KReconcileDlg::insertTransactions(void) */ } -void KReconcileDlg::slotDebitSelected(QListViewItem* /* item */, const QPoint&/*p*/, int/* col*/) +void KReconcileDlg::slotDebitSelected(TQListViewItem* /* item */, const TQPoint&/*p*/, int/* col*/) { /* KReconcileListItem *reconcileItem = (KReconcileListItem*)item; @@ -210,7 +206,7 @@ void KReconcileDlg::slotDebitSelected(QListViewItem* /* item */, const QPoint&/* */ } -void KReconcileDlg::slotCreditSelected(QListViewItem* /* item */, const QPoint&, int) +void KReconcileDlg::slotCreditSelected(TQListViewItem* /* item */, const TQPoint&, int) { /* KReconcileListItem *reconcileItem = (KReconcileListItem*)item; @@ -279,8 +275,8 @@ void KReconcileDlg::updateData(void) // Simply reload the list clearing the status. qDebug("In updateData"); m_reconciledTransactions.clear(); - m_debitsQList.clear(); - m_creditsQList.clear(); + m_debitsTQList.clear(); + m_creditsTQList.clear(); loadLists(); insertTransactions(); @@ -297,12 +293,12 @@ void KReconcileDlg::cancelClicked() */ } -void KReconcileDlg::resetData(const MyMoneyMoney /* previousBal */, const MyMoneyMoney /* endingBal */, const QDate /* endingDate */, MyMoneyAccount* /* accountIndex */, const MyMoneyFile* /* file */) +void KReconcileDlg::resetData(const MyMoneyMoney /* previousBal */, const MyMoneyMoney /* endingBal */, const TQDate /* endingDate */, MyMoneyAccount* /* accountIndex */, const MyMoneyFile* /* file */) { /* m_reconciledTransactions.clear(); - m_debitsQList.clear(); - m_creditsQList.clear(); + m_debitsTQList.clear(); + m_creditsTQList.clear(); m_balanced = false; @@ -317,11 +313,11 @@ void KReconcileDlg::resetData(const MyMoneyMoney /* previousBal */, const MyMone m_endingDate = endingDate; - //totalCreditsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - //totalDebitsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - //previousLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - //endingLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - //differenceLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //totalCreditsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //totalDebitsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //previousLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //endingLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //differenceLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); endingLabel->setText(KGlobal::locale()->formatMoney(m_clearedBalance.amount(),"")); @@ -358,34 +354,34 @@ void KReconcileDlg::reloadLists() if (transaction->state()!=MyMoneyTransaction::Reconciled) { if (transaction->type() == MyMoneyTransaction::Debit) { transaction->setIndex(i); - if(m_debitsQList.find(transaction) < 0) + if(m_debitsTQList.tqfind(transaction) < 0) { - m_debitsQList.append(transaction); + m_debitsTQList.append(transaction); } } else { transaction->setIndex(i); - if(m_creditsQList.find(transaction) < 0) + if(m_creditsTQList.tqfind(transaction) < 0) { - m_creditsQList.append(transaction); + m_creditsTQList.append(transaction); } } } } - QListIterator<MyMoneyTransaction> it(m_debitsQList); + TQListIterator<MyMoneyTransaction> it(m_debitsTQList); for ( ; it.current(); ++it) { bool transactionFound = inTransactions(it.current()); if(transactionFound == false) - m_debitsQList.remove(it.current()); + m_debitsTQList.remove(it.current()); } - QListIterator<MyMoneyTransaction> it2(m_creditsQList); + TQListIterator<MyMoneyTransaction> it2(m_creditsTQList); for ( ; it2.current(); ++it2) { bool transactionFound = inTransactions(it2.current()); if(transactionFound == false) - m_creditsQList.remove(it2.current()); + m_creditsTQList.remove(it2.current()); } */ } @@ -408,7 +404,7 @@ bool KReconcileDlg::inTransactions(MyMoneyTransaction * /*credittrans */) /* Not used (yet?) bool KReconcileDlg::inCredits(MyMoneyTransaction *transaction) { - QListIterator<MyMoneyTransaction> it(m_creditsQList); + TQListIterator<MyMoneyTransaction> it(m_creditsTQList); for ( ; it.current(); ++it) { if(transaction == it.current()) return true; @@ -422,7 +418,7 @@ bool KReconcileDlg::inCredits(MyMoneyTransaction *transaction) /* Not used (yet?) bool KReconcileDlg::inDebits(MyMoneyTransaction *transaction) { - QListIterator<MyMoneyTransaction> it(m_debitsQList); + TQListIterator<MyMoneyTransaction> it(m_debitsTQList); for ( ; it.current(); ++it) { if(transaction == it.current()) return true; @@ -440,7 +436,7 @@ void KReconcileDlg::editClicked() */ } -void KReconcileDlg::resizeEvent(QResizeEvent* /* e */) +void KReconcileDlg::resizeEvent(TQResizeEvent* /* e */) { /* debitListView->setColumnWidth( 2, debitListView->visibleWidth() diff --git a/kmymoney2/dialogs/kreconciledlg.h b/kmymoney2/dialogs/kreconciledlg.h index 9ddb079..214c583 100644 --- a/kmymoney2/dialogs/kreconciledlg.h +++ b/kmymoney2/dialogs/kreconciledlg.h @@ -17,9 +17,9 @@ #ifndef KRECONCILEDLG_H #define KRECONCILEDLG_H -#include <qlabel.h> +#include <tqlabel.h> #include <klistview.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> #include "../mymoney/mymoneyfile.h" #include "../mymoney/mymoneymoney.h" @@ -29,19 +29,20 @@ // This dialog is used for reconciliation. class KReconcileDlg : public KReconcileDlgDecl { Q_OBJECT + TQ_OBJECT public: - KReconcileDlg(const MyMoneyMoney previousBal, const MyMoneyMoney endingBal, const QDate endingDate, MyMoneyAccount *accountIndex, const MyMoneyFile* file, QWidget *parent=0, const char *name=0); + KReconcileDlg(const MyMoneyMoney previousBal, const MyMoneyMoney endingBal, const TQDate endingDate, MyMoneyAccount *accountIndex, const MyMoneyFile* file, TQWidget *tqparent=0, const char *name=0); ~KReconcileDlg(); // void updateData(void); - void resetData(const MyMoneyMoney previousBal, const MyMoneyMoney endingBal, const QDate endingDate, MyMoneyAccount *accountIndex, const MyMoneyFile* file); + void resetData(const MyMoneyMoney previousBal, const MyMoneyMoney endingBal, const TQDate endingDate, MyMoneyAccount *accountIndex, const MyMoneyFile* file); /** No descriptions */ protected: - void resizeEvent(QResizeEvent*); + void resizeEvent(TQResizeEvent*); protected slots: - void slotDebitSelected(QListViewItem*, const QPoint&, int); - void slotCreditSelected(QListViewItem*, const QPoint&, int); + void slotDebitSelected(TQListViewItem*, const TQPoint&, int); + void slotCreditSelected(TQListViewItem*, const TQPoint&, int); void finishClicked(); void cancelClicked(); /** No descriptions */ @@ -61,13 +62,13 @@ private: //MyMoneyBank m_bankIndex; MyMoneyAccount *m_accountIndex; - QList<MyMoneyTransaction> m_debitsQList; - QList<MyMoneyTransaction> m_creditsQList; - QList<MyMoneyTransaction> m_reconciledTransactions; + TQList<MyMoneyTransaction> m_debitsTQList; + TQList<MyMoneyTransaction> m_creditsTQList; + TQList<MyMoneyTransaction> m_reconciledTransactions; bool m_balanced; // true when the account is balanced (determined by doDifference) - QDate m_endingDate; + TQDate m_endingDate; void loadLists(void); void insertTransactions(void); diff --git a/kmymoney2/dialogs/kreconciledlgdecl.ui b/kmymoney2/dialogs/kreconciledlgdecl.ui index c75ceed..9ed4dc1 100644 --- a/kmymoney2/dialogs/kreconciledlgdecl.ui +++ b/kmymoney2/dialogs/kreconciledlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KReconcileDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>reconcileDlg</cstring> </property> @@ -12,7 +12,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -34,7 +34,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -48,7 +48,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>descriptionLabel</cstring> </property> @@ -63,7 +63,7 @@ a transaction you can return to the register by clicking on the Edit Transaction Your account is balanced when the Difference is Zero. Click on the Finish button to save the reconciled transactions.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -85,7 +85,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout27</cstring> </property> @@ -99,11 +99,11 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout25</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>420</width> <height>0</height> @@ -119,7 +119,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -131,7 +131,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>420</width> <height>15</height> @@ -153,7 +153,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>420</width> <height>100</height> @@ -162,7 +162,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout26</cstring> </property> @@ -176,7 +176,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_3_2</cstring> </property> @@ -188,7 +188,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>15</height> @@ -210,7 +210,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>420</width> <height>100</height> @@ -221,7 +221,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -235,7 +235,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>totalDebitsLabel</cstring> </property> @@ -264,14 +264,14 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>totalCreditsLabel</cstring> </property> @@ -289,7 +289,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -313,14 +313,14 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>infoGroup</cstring> </property> @@ -332,7 +332,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>250</width> <height>120</height> @@ -351,7 +351,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -365,7 +365,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -377,7 +377,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>0</height> @@ -386,13 +386,13 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>Previous Balance:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>broughtForwardLabel</cstring> </property> @@ -407,7 +407,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>0</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -415,7 +415,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -429,7 +429,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -441,7 +441,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>0</height> @@ -450,13 +450,13 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>Ending Balance:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>previousLabel</cstring> </property> @@ -468,7 +468,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -477,7 +477,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>0</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -485,7 +485,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -499,7 +499,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -511,7 +511,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>0</height> @@ -520,13 +520,13 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>Cleared Balance:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>endingLabel</cstring> </property> @@ -538,7 +538,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -547,7 +547,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>0</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -555,7 +555,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -569,7 +569,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -581,7 +581,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>0</height> @@ -590,13 +590,13 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>Difference:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>differenceLabel</cstring> </property> @@ -611,7 +611,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>0</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -623,7 +623,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -637,7 +637,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonEdit</cstring> </property> @@ -655,14 +655,14 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -676,7 +676,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -705,5 +705,5 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp index 949601d..d904d1a 100644 --- a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp +++ b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp @@ -28,22 +28,22 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qvariant.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qframe.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qlayout.h> -#include <qspinbox.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qtabwidget.h> -#include <qtextedit.h> -#include <qlayout.h> -#include <qapplication.h> +#include <tqvariant.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqlayout.h> +#include <tqspinbox.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqtabwidget.h> +#include <tqtextedit.h> +#include <tqlayout.h> +#include <tqapplication.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -76,8 +76,8 @@ #include "../widgets/kmymoneyreportconfigtabchartdecl.h" KReportConfigurationFilterDlg::KReportConfigurationFilterDlg( - MyMoneyReport report, QWidget *parent, const char *name) - : KFindTransactionDlg(parent, name), + MyMoneyReport report, TQWidget *tqparent, const char *name) + : KFindTransactionDlg(tqparent, name), m_tab2(0), m_tab3(0), m_tabChart(0), @@ -96,13 +96,13 @@ KReportConfigurationFilterDlg::KReportConfigurationFilterDlg( // // the Ok button is always enabled - disconnect(SIGNAL(selectionEmpty(bool))); + disconnect(TQT_SIGNAL(selectionEmpty(bool))); m_searchButton->setGuiItem( KStdGuiItem::ok() ); m_searchButton->setEnabled(true); // reconnect the close button m_closeButton->disconnect(); - connect(m_closeButton, SIGNAL(clicked()), this, SLOT(reject())); + connect(m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); // // Add new tabs @@ -115,10 +115,10 @@ KReportConfigurationFilterDlg::KReportConfigurationFilterDlg( { m_tab2 = new kMyMoneyReportConfigTab2Decl( m_criteriaTab, "kMyMoneyReportConfigTab2" ); m_criteriaTab->insertTab( m_tab2, i18n( "Rows/Columns"), 1 ); - connect(m_tab2->m_comboRows, SIGNAL(highlighted(int)), this, SLOT(slotRowTypeChanged(int))); - connect(m_tab2->m_comboColumns, SIGNAL(activated(int)), this, SLOT(slotColumnTypeChanged(int))); + connect(m_tab2->m_comboRows, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotRowTypeChanged(int))); + connect(m_tab2->m_comboColumns, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotColumnTypeChanged(int))); //control the state of the includeTransfer check - connect(m_categoriesView, SIGNAL(stateChanged()), this, SLOT(slotUpdateCheckTransfers())); + connect(m_categoriesView, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(slotUpdateCheckTransfers())); #ifdef HAVE_KDCHART m_tabChart = new kMyMoneyReportConfigTabChartDecl( m_criteriaTab, "kMyMoneyReportConfigTabChart" ); @@ -139,8 +139,8 @@ KReportConfigurationFilterDlg::KReportConfigurationFilterDlg( m_criteriaTab->showPage( m_tab1 ); m_criteriaTab->setMinimumSize( 500,200 ); - QValueList<MyMoneyBudget> list = MyMoneyFile::instance()->budgetList(); - QValueList<MyMoneyBudget>::const_iterator it_b; + TQValueList<MyMoneyBudget> list = MyMoneyFile::instance()->budgetList(); + TQValueList<MyMoneyBudget>::const_iterator it_b; for(it_b = list.begin(); it_b != list.end(); ++it_b) { m_budgets.push_back(*it_b); } @@ -201,7 +201,7 @@ void KReportConfigurationFilterDlg::slotSearch(void) if(m_tab2->m_comboBudget->isEnabled()) { m_currentState.setBudget(m_budgets[m_tab2->m_comboBudget->currentItem()].id(), m_initialState.rowType() == MyMoneyReport::eBudgetActual); } else { - m_currentState.setBudget(QString(), false); + m_currentState.setBudget(TQString(), false); } //set moving average days @@ -214,32 +214,32 @@ void KReportConfigurationFilterDlg::slotSearch(void) MyMoneyReport::ERowType rtq[7] = { MyMoneyReport::eCategory, MyMoneyReport::eTopCategory, MyMoneyReport::ePayee, MyMoneyReport::eAccount, MyMoneyReport::eTopAccount, MyMoneyReport::eMonth, MyMoneyReport::eWeek }; m_currentState.setRowType( rtq[m_tab3->m_comboOrganizeBy->currentItem()] ); - unsigned qc = MyMoneyReport::eQCnone; + unsigned qc = MyMoneyReport::eTQCnone; - if (m_currentState.queryColumns() & MyMoneyReport::eQCloan) + if (m_currentState.queryColumns() & MyMoneyReport::eTQCloan) // once a loan report, always a loan report - qc = MyMoneyReport::eQCloan; + qc = MyMoneyReport::eTQCloan; if ( m_tab3->m_checkNumber->isChecked() ) - qc |= MyMoneyReport::eQCnumber; + qc |= MyMoneyReport::eTQCnumber; if ( m_tab3->m_checkPayee->isChecked() ) - qc |= MyMoneyReport::eQCpayee; + qc |= MyMoneyReport::eTQCpayee; if ( m_tab3->m_checkCategory->isChecked() ) - qc |= MyMoneyReport::eQCcategory; + qc |= MyMoneyReport::eTQCcategory; if ( m_tab3->m_checkMemo->isChecked() ) - qc |= MyMoneyReport::eQCmemo; + qc |= MyMoneyReport::eTQCmemo; if ( m_tab3->m_checkAccount->isChecked() ) - qc |= MyMoneyReport::eQCaccount; + qc |= MyMoneyReport::eTQCaccount; if ( m_tab3->m_checkReconciled->isChecked() ) - qc |= MyMoneyReport::eQCreconciled; + qc |= MyMoneyReport::eTQCreconciled; if ( m_tab3->m_checkAction->isChecked() ) - qc |= MyMoneyReport::eQCaction; + qc |= MyMoneyReport::eTQCaction; if ( m_tab3->m_checkShares->isChecked() ) - qc |= MyMoneyReport::eQCshares; + qc |= MyMoneyReport::eTQCshares; if ( m_tab3->m_checkPrice->isChecked() ) - qc |= MyMoneyReport::eQCprice; + qc |= MyMoneyReport::eTQCprice; if( m_tab3->m_checkBalance->isChecked() ) - qc |= MyMoneyReport::eQCbalance; + qc |= MyMoneyReport::eTQCbalance; m_currentState.setQueryColumns(static_cast<MyMoneyReport::EQueryColumns>(qc)); @@ -373,12 +373,12 @@ void KReportConfigurationFilterDlg::slotReset(void) || m_initialState.rowType() == MyMoneyReport::eBudgetActual) { m_tab2->m_comboRows->setEnabled(false); m_tab2->m_budgetFrame->setEnabled(!m_budgets.empty()); - QValueVector<MyMoneyBudget>::const_iterator it_b; + TQValueVector<MyMoneyBudget>::const_iterator it_b; int i = 0; for(it_b = m_budgets.begin(); it_b != m_budgets.end(); ++it_b) { m_tab2->m_comboBudget->insertItem((*it_b).name(), i); //set the current selected item - if( (m_initialState.budget() == "Any" && (*it_b).budgetStart().year() == QDate::currentDate().year()) + if( (m_initialState.budget() == "Any" && (*it_b).budgetStart().year() == TQDate::tqcurrentDate().year()) || m_initialState.budget() == (*it_b).id()) m_tab2->m_comboBudget->setCurrentItem(i); i++; @@ -426,16 +426,16 @@ void KReportConfigurationFilterDlg::slotReset(void) } unsigned qc = m_initialState.queryColumns(); - m_tab3->m_checkNumber->setChecked(qc & MyMoneyReport::eQCnumber); - m_tab3->m_checkPayee->setChecked(qc & MyMoneyReport::eQCpayee); - m_tab3->m_checkCategory->setChecked(qc & MyMoneyReport::eQCcategory); - m_tab3->m_checkMemo->setChecked(qc & MyMoneyReport::eQCmemo); - m_tab3->m_checkAccount->setChecked(qc & MyMoneyReport::eQCaccount); - m_tab3->m_checkReconciled->setChecked(qc & MyMoneyReport::eQCreconciled); - m_tab3->m_checkAction->setChecked(qc & MyMoneyReport::eQCaction); - m_tab3->m_checkShares->setChecked(qc & MyMoneyReport::eQCshares); - m_tab3->m_checkPrice->setChecked(qc & MyMoneyReport::eQCprice); - m_tab3->m_checkBalance->setChecked(qc & MyMoneyReport::eQCbalance); + m_tab3->m_checkNumber->setChecked(qc & MyMoneyReport::eTQCnumber); + m_tab3->m_checkPayee->setChecked(qc & MyMoneyReport::eTQCpayee); + m_tab3->m_checkCategory->setChecked(qc & MyMoneyReport::eTQCcategory); + m_tab3->m_checkMemo->setChecked(qc & MyMoneyReport::eTQCmemo); + m_tab3->m_checkAccount->setChecked(qc & MyMoneyReport::eTQCaccount); + m_tab3->m_checkReconciled->setChecked(qc & MyMoneyReport::eTQCreconciled); + m_tab3->m_checkAction->setChecked(qc & MyMoneyReport::eTQCaction); + m_tab3->m_checkShares->setChecked(qc & MyMoneyReport::eTQCshares); + m_tab3->m_checkPrice->setChecked(qc & MyMoneyReport::eTQCprice); + m_tab3->m_checkBalance->setChecked(qc & MyMoneyReport::eTQCbalance); m_tab3->m_checkTax->setChecked( m_initialState.isTax() ); m_tab3->m_checkInvestments->setChecked( m_initialState.isInvestmentsOnly() ); @@ -478,7 +478,7 @@ void KReportConfigurationFilterDlg::slotReset(void) // Text Filter // - QRegExp textfilter; + TQRegExp textfilter; if ( m_initialState.textFilter(textfilter)) { m_textEdit->setText(textfilter.pattern()); @@ -503,7 +503,7 @@ void KReportConfigurationFilterDlg::slotReset(void) // Number Filter // - QString nrFrom, nrTo; + TQString nrFrom, nrTo; if ( m_initialState.numberFilter(nrFrom, nrTo) ) { if ( nrFrom == nrTo ) @@ -512,8 +512,8 @@ void KReportConfigurationFilterDlg::slotReset(void) m_nrFromEdit->setEnabled(false); m_nrToEdit->setEnabled(false); m_nrEdit->setText(nrFrom); - m_nrFromEdit->setText(QString()); - m_nrToEdit->setText(QString()); + m_nrFromEdit->setText(TQString()); + m_nrToEdit->setText(TQString()); m_nrButton->setChecked(true); m_nrRangeButton->setChecked(false); } @@ -522,7 +522,7 @@ void KReportConfigurationFilterDlg::slotReset(void) m_nrEdit->setEnabled(false); m_nrFromEdit->setEnabled(true); m_nrToEdit->setEnabled(false); - m_nrEdit->setText(QString()); + m_nrEdit->setText(TQString()); m_nrFromEdit->setText(nrFrom); m_nrToEdit->setText(nrTo); m_nrButton->setChecked(false); @@ -534,9 +534,9 @@ void KReportConfigurationFilterDlg::slotReset(void) m_nrEdit->setEnabled(true); m_nrFromEdit->setEnabled(false); m_nrToEdit->setEnabled(false); - m_nrEdit->setText(QString()); - m_nrFromEdit->setText(QString()); - m_nrToEdit->setText(QString()); + m_nrEdit->setText(TQString()); + m_nrFromEdit->setText(TQString()); + m_nrToEdit->setText(TQString()); m_nrButton->setChecked(true); m_nrRangeButton->setChecked(false); } @@ -553,9 +553,9 @@ void KReportConfigurationFilterDlg::slotReset(void) m_amountEdit->setEnabled(true); m_amountFromEdit->setEnabled(false); m_amountToEdit->setEnabled(false); - m_amountEdit->loadText(QString::number(from.toDouble())); - m_amountFromEdit->loadText(QString()); - m_amountToEdit->loadText(QString()); + m_amountEdit->loadText(TQString::number(from.toDouble())); + m_amountFromEdit->loadText(TQString()); + m_amountToEdit->loadText(TQString()); m_amountButton->setChecked(true); m_amountRangeButton->setChecked(false); } @@ -564,9 +564,9 @@ void KReportConfigurationFilterDlg::slotReset(void) m_amountEdit->setEnabled(false); m_amountFromEdit->setEnabled(true); m_amountToEdit->setEnabled(true); - m_amountEdit->loadText(QString()); - m_amountFromEdit->loadText(QString::number(from.toDouble())); - m_amountToEdit->loadText(QString::number(to.toDouble())); + m_amountEdit->loadText(TQString()); + m_amountFromEdit->loadText(TQString::number(from.toDouble())); + m_amountToEdit->loadText(TQString::number(to.toDouble())); m_amountButton->setChecked(false); m_amountRangeButton->setChecked(true); } @@ -576,9 +576,9 @@ void KReportConfigurationFilterDlg::slotReset(void) m_amountEdit->setEnabled(true); m_amountFromEdit->setEnabled(false); m_amountToEdit->setEnabled(false); - m_amountEdit->loadText(QString()); - m_amountFromEdit->loadText(QString()); - m_amountToEdit->loadText(QString()); + m_amountEdit->loadText(TQString()); + m_amountFromEdit->loadText(TQString()); + m_amountToEdit->loadText(TQString()); m_amountButton->setChecked(true); m_amountRangeButton->setChecked(false); } @@ -587,7 +587,7 @@ void KReportConfigurationFilterDlg::slotReset(void) // Payees Filter // - QStringList payees; + TQStringList payees; if ( m_initialState.payees(payees) ) { if ( payees.empty() ) @@ -609,7 +609,7 @@ void KReportConfigurationFilterDlg::slotReset(void) // Accounts Filter // - QStringList accounts; + TQStringList accounts; if ( m_initialState.accounts(accounts) ) { m_accountsView->selectAllItems(false); @@ -638,7 +638,7 @@ void KReportConfigurationFilterDlg::slotReset(void) // that's why we call it last m_initialState.updateDateFilter(); - QDate dateFrom, dateTo; + TQDate dateFrom, dateTo; if ( m_initialState.dateFilter( dateFrom, dateTo ) ) { if(m_initialState.isUserDefined()) { diff --git a/kmymoney2/dialogs/kreportconfigurationfilterdlg.h b/kmymoney2/dialogs/kreportconfigurationfilterdlg.h index 56e398d..0a80e60 100644 --- a/kmymoney2/dialogs/kreportconfigurationfilterdlg.h +++ b/kmymoney2/dialogs/kreportconfigurationfilterdlg.h @@ -24,7 +24,7 @@ #ifndef KREPORTCONFIGURATIONFILTERDLG_H #define KREPORTCONFIGURATIONFILTERDLG_H -#include <qvaluevector.h> +#include <tqvaluevector.h> #include "../dialogs/kfindtransactiondlg.h" #include "../mymoney/mymoneyreport.h" @@ -42,8 +42,9 @@ class MyMoneyBudget; class KReportConfigurationFilterDlg : public KFindTransactionDlg { Q_OBJECT + TQ_OBJECT public: - KReportConfigurationFilterDlg(MyMoneyReport report, QWidget *parent = 0, const char *name = 0); + KReportConfigurationFilterDlg(MyMoneyReport report, TQWidget *tqparent = 0, const char *name = 0); ~KReportConfigurationFilterDlg(); const MyMoneyReport& getConfig(void) const { return m_currentState; } @@ -72,7 +73,7 @@ protected slots: virtual void slotDateChanged(void); private: - QValueVector<MyMoneyBudget> m_budgets; + TQValueVector<MyMoneyBudget> m_budgets; }; #endif diff --git a/kmymoney2/dialogs/ksecuritylisteditor.cpp b/kmymoney2/dialogs/ksecuritylisteditor.cpp index ee4c486..86e2e66 100644 --- a/kmymoney2/dialogs/ksecuritylisteditor.cpp +++ b/kmymoney2/dialogs/ksecuritylisteditor.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qcheckbox.h> +#include <tqcheckbox.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -51,49 +51,49 @@ #define ACCFRACT_COL 6 #define CASHFRACT_COL 7 -#define CURRENCY_MARKET QString("ISO 4217") +#define CURRENCY_MARKET TQString("ISO 4217") -KSecurityListEditor::KSecurityListEditor(QWidget *parent, const char *name) : - KSecurityListEditorDecl(parent, name) +KSecurityListEditor::KSecurityListEditor(TQWidget *tqparent, const char *name) : + KSecurityListEditorDecl(tqparent, name) { m_listView->setColumnWidth(ID_COL, 0); - m_listView->setColumnWidthMode(NAME_COL, QListView::Maximum); - m_listView->setColumnWidthMode(ID_COL, QListView::Manual); - m_listView->setColumnAlignment(CURR_COL, Qt::AlignHCenter); + m_listView->setColumnWidthMode(NAME_COL, TQListView::Maximum); + m_listView->setColumnWidthMode(ID_COL, TQListView::Manual); + m_listView->setColumnAlignment(CURR_COL, TQt::AlignHCenter); m_listView->setMultiSelection(false); m_listView->setAllColumnsShowFocus(true); KIconLoader *il = KGlobal::iconLoader(); KGuiItem removeButtenItem( i18n( "&Delete" ), - QIconSet(il->loadIcon("delete", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("delete", KIcon::Small, KIcon::SizeSmall)), i18n("Delete this entry"), i18n("Remove this security item from the file")); m_deleteButton->setGuiItem(removeButtenItem); KGuiItem addButtenItem( i18n( "&Add" ), - QIconSet(il->loadIcon("file_new", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("file_new", KIcon::Small, KIcon::SizeSmall)), i18n("Add a new entry"), i18n("Create a new security entry.")); m_addButton->setGuiItem(addButtenItem); KGuiItem editButtenItem( i18n( "&Edit" ), - QIconSet(il->loadIcon("edit", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("edit", KIcon::Small, KIcon::SizeSmall)), i18n("Modify the selected entry"), i18n("Change the security information of the selected entry.")); m_editButton->setGuiItem(editButtenItem); KGuiItem okButtenItem( i18n("&Close" ), - QIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)), i18n("Close the dialog"), i18n("Use this to close the dialog and return to the application.")); m_closeButton->setGuiItem(okButtenItem); - connect(m_closeButton, SIGNAL(clicked()), this, SLOT(reject())); - connect(m_showCurrencyButton, SIGNAL(toggled(bool)), this, SLOT(slotLoadList())); - connect(m_listView, SIGNAL(selectionChanged()), this, SLOT(slotUpdateButtons())); + connect(m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(m_showCurrencyButton, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotLoadList())); + connect(m_listView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateButtons())); - connect(m_editButton, SIGNAL(clicked()), this, SLOT(slotEditSecurity())); - connect(m_deleteButton, SIGNAL(clicked()), this, SLOT(slotDeleteSecurity())); + connect(m_editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSecurity())); + connect(m_deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteSecurity())); // FIXME for now, the only way to add a new security is to add a new investment m_addButton->hide(); @@ -109,22 +109,22 @@ void KSecurityListEditor::slotLoadList(void) { m_listView->clear(); - QValueList<MyMoneySecurity> list = MyMoneyFile::instance()->securityList(); - QValueList<MyMoneySecurity>::ConstIterator it; + TQValueList<MyMoneySecurity> list = MyMoneyFile::instance()->securityList(); + TQValueList<MyMoneySecurity>::ConstIterator it; if(m_showCurrencyButton->isChecked()) { list += MyMoneyFile::instance()->currencyList(); } for(it = list.begin(); it != list.end(); ++it) { - KListViewItem* newItem = new KListViewItem(m_listView, QString((*it).id())); + KListViewItem* newItem = new KListViewItem(m_listView, TQString((*it).id())); fillItem(newItem, *it); } slotUpdateButtons(); } -void KSecurityListEditor::fillItem(QListViewItem* item, const MyMoneySecurity& security) +void KSecurityListEditor::fillItem(TQListViewItem* item, const MyMoneySecurity& security) { - QString market = security.tradingMarket(); + TQString market = security.tradingMarket(); MyMoneySecurity tradingCurrency; if(security.isCurrency()) market = CURRENCY_MARKET; @@ -136,16 +136,16 @@ void KSecurityListEditor::fillItem(QListViewItem* item, const MyMoneySecurity& s item->setText(SYMBOL_COL, security.tradingSymbol()); item->setText(MARKET_COL, market); item->setText(CURR_COL, tradingCurrency.tradingSymbol()); - item->setText(ACCFRACT_COL, QString::number(security.smallestAccountFraction())); + item->setText(ACCFRACT_COL, TQString::number(security.smallestAccountFraction())); // smallestCashFraction is only applicable for currencies if(security.isCurrency()) - item->setText(CASHFRACT_COL, QString::number(security.smallestCashFraction())); + item->setText(CASHFRACT_COL, TQString::number(security.smallestCashFraction())); } void KSecurityListEditor::slotUpdateButtons(void) { - QListViewItem* item = m_listView->selectedItem(); + TQListViewItem* item = m_listView->selectedItem(); if(item) { MyMoneySecurity security = MyMoneyFile::instance()->security(item->text(ID_COL).latin1()); @@ -160,13 +160,13 @@ void KSecurityListEditor::slotUpdateButtons(void) void KSecurityListEditor::slotEditSecurity(void) { - QListViewItem* item = m_listView->selectedItem(); + TQListViewItem* item = m_listView->selectedItem(); if(item) { MyMoneySecurity security = MyMoneyFile::instance()->security(item->text(ID_COL).latin1()); KNewInvestmentWizard dlg(security, this, "KNewInvestmentWizard"); - if(dlg.exec() == QDialog::Accepted) { - dlg.createObjects(QString()); + if(dlg.exec() == TQDialog::Accepted) { + dlg.createObjects(TQString()); security = MyMoneyFile::instance()->security(item->text(ID_COL).latin1()); fillItem(item, security); } @@ -175,16 +175,16 @@ void KSecurityListEditor::slotEditSecurity(void) void KSecurityListEditor::slotDeleteSecurity(void) { - QListViewItem* item = m_listView->selectedItem(); + TQListViewItem* item = m_listView->selectedItem(); if(item) { MyMoneySecurity security = MyMoneyFile::instance()->security(item->text(ID_COL).latin1()); - QString msg; - QString dontAsk; + TQString msg; + TQString dontAsk; if(security.isCurrency()) { - msg = QString("<p>") + i18n("Do you really want to remove the currency <b>%1</b> from the file?</p><i>Note: It is currently not supported to add currencies.</i>").arg(security.name()); + msg = TQString("<p>") + i18n("Do you really want to remove the currency <b>%1</b> from the file?</p><i>Note: It is currently not supported to add currencies.</i>").tqarg(security.name()); dontAsk = "DeleteCurrency"; } else { - msg = QString("<p>") + i18n("Do you really want to remove the %1 <b>%2</b> from the file?").arg(KMyMoneyUtils::securityTypeToString(security.securityType())).arg(security.name()); + msg = TQString("<p>") + i18n("Do you really want to remove the %1 <b>%2</b> from the file?").tqarg(KMyMoneyUtils::securityTypeToString(security.securityType())).tqarg(security.name()); dontAsk = "DeleteSecurity"; } if(KMessageBox::questionYesNo(this, msg, i18n("Delete security"), KStdGuiItem::yes(), KStdGuiItem::no(), dontAsk) == KMessageBox::Yes) { diff --git a/kmymoney2/dialogs/ksecuritylisteditor.h b/kmymoney2/dialogs/ksecuritylisteditor.h index 050edbe..ec77483 100644 --- a/kmymoney2/dialogs/ksecuritylisteditor.h +++ b/kmymoney2/dialogs/ksecuritylisteditor.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- // QT Includes -class QListViewItem; +class TQListViewItem; // ---------------------------------------------------------------------------- // KDE Includes @@ -40,8 +40,9 @@ class QListViewItem; class KSecurityListEditor : public KSecurityListEditorDecl { Q_OBJECT + TQ_OBJECT public: - KSecurityListEditor(QWidget *parent, const char* name = 0); + KSecurityListEditor(TQWidget *tqparent, const char* name = 0); ~KSecurityListEditor(); protected slots: @@ -51,7 +52,7 @@ protected slots: void slotDeleteSecurity(void); protected: - void fillItem(QListViewItem* item, const MyMoneySecurity& security); + void fillItem(TQListViewItem* item, const MyMoneySecurity& security); }; diff --git a/kmymoney2/dialogs/ksecuritylisteditordecl.ui b/kmymoney2/dialogs/ksecuritylisteditordecl.ui index cbb9999..1347cb0 100644 --- a/kmymoney2/dialogs/ksecuritylisteditordecl.ui +++ b/kmymoney2/dialogs/ksecuritylisteditordecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KSecurityListEditorDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KSecurityListEditorDecl</cstring> </property> @@ -22,9 +22,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -123,9 +123,9 @@ <cstring>m_listView</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>51</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>110</height> @@ -193,7 +193,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_showCurrencyButton</cstring> </property> @@ -215,9 +215,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>20</height> @@ -258,5 +258,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kselectdatabasedlg.cpp b/kmymoney2/dialogs/kselectdatabasedlg.cpp index 941712c..47d092d 100644 --- a/kmymoney2/dialogs/kselectdatabasedlg.cpp +++ b/kmymoney2/dialogs/kselectdatabasedlg.cpp @@ -22,14 +22,14 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlayout.h> -#include <qpushbutton.h> -#include <qapplication.h> -#include <qsqldatabase.h> -#include <qfiledialog.h> -#include <qstatusbar.h> -#include <qcheckbox.h> -#include <qcolor.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqapplication.h> +#include <tqsqldatabase.h> +#include <tqfiledialog.h> +#include <tqstatusbar.h> +#include <tqcheckbox.h> +#include <tqcolor.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -45,24 +45,24 @@ #include "kselectdatabasedlg.h" -KSelectDatabaseDlg::KSelectDatabaseDlg(QWidget *parent, const char *name) - : KSelectDatabaseDlgDecl(parent, name) { +KSelectDatabaseDlg::KSelectDatabaseDlg(TQWidget *tqparent, const char *name) + : KSelectDatabaseDlgDecl(tqparent, name) { listDrivers->clear(); // list drivers supported by KMM - QMap<QString, QString> map = m_map.driverMap(); + TQMap<TQString, TQString> map = m_map.driverMap(); // list drivers installed on system - QStringList list = QSqlDatabase::drivers(); + TQStringList list = TQSqlDatabase::drivers(); if (list.count() == 0) { - KMessageBox::error (0, i18n("There are no Qt SQL drivers installed in your system.\n" - "Please consult documentation for your distro, or visit the Qt web site (www.trolltech.com)" + KMessageBox::error (0, i18n("There are no TQt SQL drivers installed in your system.\n" + "Please consult documentation for your distro, or visit the TQt web site (www.trolltech.com)" " and search for SQL drivers."), ""); setError(); } else { - QStringList::Iterator it = list.begin(); + TQStringList::Iterator it = list.begin(); while(it != list.end()) { - QString dname = *it; - if (map.keys().contains(dname)) { // only display if driver is supported + TQString dname = *it; + if (map.keys().tqcontains(dname)) { // only display if driver is supported dname = dname + " - " + map[dname]; listDrivers->insertItem (dname); } @@ -73,20 +73,20 @@ KSelectDatabaseDlg::KSelectDatabaseDlg(QWidget *parent, const char *name) textUserName->setText(""); struct passwd * pwd = getpwuid(geteuid()); if (pwd != 0) - textUserName->setText (QString(pwd->pw_name)); + textUserName->setText (TQString(pwd->pw_name)); textPassword->setText (""); - m_requiredFields = new kMandatoryFieldGroup(this); + m_requiredFields = new kMandatoryFieldGroup(TQT_TQOBJECT(this)); m_requiredFields->setOkButton(buttonOK); m_requiredFields->add(listDrivers); m_requiredFields->add(textDbName); - connect (listDrivers, SIGNAL(clicked(QListBoxItem *)), - this, SLOT(slotDriverSelected(QListBoxItem *))); - connect (buttonSQL, SIGNAL(clicked()), this, SLOT(slotGenerateSQL())); - connect (buttonOK, SIGNAL(clicked()), this, SLOT(accept())); + connect (listDrivers, TQT_SIGNAL(clicked(TQListBoxItem *)), + this, TQT_SLOT(slotDriverSelected(TQListBoxItem *))); + connect (buttonSQL, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGenerateSQL())); + connect (buttonOK, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); checkPreLoad->setChecked(false); buttonSQL->setEnabled(true); } - connect (buttonHelp, SIGNAL(clicked()), this, SLOT(slotHelp())); + connect (buttonHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp())); // ensure a driver gets selected; pre-select if only one listDrivers->clearSelection(); if (listDrivers->count() == 1) { @@ -95,30 +95,30 @@ KSelectDatabaseDlg::KSelectDatabaseDlg(QWidget *parent, const char *name) } } -KSelectDatabaseDlg::KSelectDatabaseDlg(KURL openURL, QWidget *parent, const char *name) - : KSelectDatabaseDlgDecl(parent, name) { +KSelectDatabaseDlg::KSelectDatabaseDlg(KURL openURL, TQWidget *tqparent, const char *name) + : KSelectDatabaseDlgDecl(tqparent, name) { // here we are re-opening a database from a URL // probably taken from the last-used or recent file list listDrivers->clear(); // check that the SQL driver is still available - QString driverName = openURL.queryItem("driver"); + TQString driverName = openURL.queryItem("driver"); // list drivers installed on system - QStringList list = QSqlDatabase::drivers(); + TQStringList list = TQSqlDatabase::drivers(); // list drivers supported by KMM - QMap<QString, QString> map = m_map.driverMap(); - if (!list.contains(driverName)) { - KMessageBox::error (0, i18n("Qt SQL driver %1 is no longer installed on your system").arg(driverName), + TQMap<TQString, TQString> map = m_map.driverMap(); + if (!list.tqcontains(driverName)) { + KMessageBox::error (0, i18n("TQt SQL driver %1 is no longer installed on your system").tqarg(driverName), ""); setError(); - } else if (!map.contains(driverName)) { - KMessageBox::error (0, i18n("Qt SQL driver %1 is not suported").arg(driverName), + } else if (!map.tqcontains(driverName)) { + KMessageBox::error (0, i18n("TQt SQL driver %1 is not suported").tqarg(driverName), ""); setError(); } else { // fill in the fixed data from the URL - listDrivers->insertItem (QString(driverName + " - " + map[driverName])); + listDrivers->insertItem (TQString(driverName + " - " + map[driverName])); listDrivers->setSelected(0,true); - QString dbName = openURL.path().right(openURL.path().length() - 1); // remove separator slash + TQString dbName = openURL.path().right(openURL.path().length() - 1); // remove separator slash textDbName->setText (dbName); textHostName->setText (openURL.host()); textUserName->setText(openURL.user()); @@ -131,14 +131,14 @@ KSelectDatabaseDlg::KSelectDatabaseDlg(KURL openURL, QWidget *parent, const char textPassword->setFocus(); buttonSQL->setEnabled(false); // set password as required - m_requiredFields = new kMandatoryFieldGroup(this); + m_requiredFields = new kMandatoryFieldGroup(TQT_TQOBJECT(this)); m_requiredFields->add(textPassword); m_requiredFields->setOkButton(buttonOK); - connect (buttonOK, SIGNAL(clicked()), this, SLOT(accept())); + connect (buttonOK, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); checkPreLoad->setChecked(false); } - connect (buttonHelp, SIGNAL(clicked()), this, SLOT(slotHelp())); + connect (buttonHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp())); } @@ -158,20 +158,20 @@ const KURL KSelectDatabaseDlg::selectedURL() { url.setPass(textPassword->text()); url.setHost(textHostName->text()); url.setPath("/" + textDbName->text()); - QString qs = QString("driver=%1") - .arg(listDrivers->currentText().section (' ', 0, 0)); + TQString qs = TQString("driver=%1") + .tqarg(listDrivers->currentText().section (' ', 0, 0)); if (checkPreLoad->isChecked()) qs.append("&options=loadAll"); if (!textPassword->text().isEmpty()) qs.append("&secure=yes"); url.setQuery(qs); return (url); } -void KSelectDatabaseDlg::slotDriverSelected (QListBoxItem *driver) { +void KSelectDatabaseDlg::slotDriverSelected (TQListBoxItem *driver) { databaseTypeE dbType = m_map.driverToType(driver->text().section(' ', 0, 0)); if (!m_map.isTested(dbType)) { int rc = KMessageBox::warningContinueCancel (0, - i18n("Qt SQL driver %1 has not been fully tested in a KMyMoney environment. Please make sure you have adequate backups of your data. Please report any problems to the developer mailing list at kmymoney2-developer@lists.sourceforge.net") - .arg(driver->text()), + i18n("TQt SQL driver %1 has not been fully tested in a KMyMoney environment. Please make sure you have adequate backups of your data. Please report any problems to the developer mailing list at kmymoney2-developer@lists.sourceforge.net") + .tqarg(driver->text()), ""); if (rc == KMessageBox::Cancel) { listDrivers->clearSelection(); @@ -180,12 +180,12 @@ void KSelectDatabaseDlg::slotDriverSelected (QListBoxItem *driver) { } if (dbType == Sqlite3){ - QString dbName = QFileDialog::getOpenFileName( + TQString dbName = TQFileDialog::getOpenFileName( "", - i18n("SQLite files (*.sql);; All files (*.*)"), + i18n("STQLite files (*.sql);; All files (*.*)"), this, "", - i18n("Select SQLite file")); + i18n("Select STQLite file")); if (dbName.isNull()) { listDrivers->setSelected(driver, false); return; @@ -204,16 +204,16 @@ void KSelectDatabaseDlg::slotDriverSelected (QListBoxItem *driver) { } void KSelectDatabaseDlg::slotGenerateSQL () { - QString fileName = QFileDialog::getSaveFileName( + TQString fileName = TQFileDialog::getSaveFileName( "", i18n("All files (*.*)"), this, "", i18n("Select output file")); if (fileName == "") return; - QFile out(fileName); + TQFile out(fileName); if (!out.open(IO_WriteOnly)) return; - QTextStream s(&out); + TQTextStream s(&out); MyMoneyDbDef db; s << db.generateSQL(listDrivers->currentText().section (' ', 0, 0)); out.close(); diff --git a/kmymoney2/dialogs/kselectdatabasedlg.h b/kmymoney2/dialogs/kselectdatabasedlg.h index bc5a782..28c44d8 100644 --- a/kmymoney2/dialogs/kselectdatabasedlg.h +++ b/kmymoney2/dialogs/kselectdatabasedlg.h @@ -20,9 +20,9 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlistbox.h> -#include <qlineedit.h> -#include <qlabel.h> +#include <tqlistbox.h> +#include <tqlineedit.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -37,9 +37,10 @@ class KSelectDatabaseDlg : public KSelectDatabaseDlgDecl { Q_OBJECT + TQ_OBJECT public: - KSelectDatabaseDlg(QWidget *parent = 0, const char *name = 0); - KSelectDatabaseDlg(KURL openURL, QWidget *parent = 0, const char *name = 0); + KSelectDatabaseDlg(TQWidget *tqparent = 0, const char *name = 0); + KSelectDatabaseDlg(KURL openURL, TQWidget *tqparent = 0, const char *name = 0); ~KSelectDatabaseDlg(); /** Set the mode of this dialog * @param - openMode (IO_ReadWrite = open database; IO_WriteOnly = saveas database) @@ -51,7 +52,7 @@ public: const KURL selectedURL(); public slots: - void slotDriverSelected(QListBoxItem *driver); + void slotDriverSelected(TQListBoxItem *driver); void slotHelp(); void slotGenerateSQL(); private: diff --git a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui index 4736fb7..20a8dd0 100644 --- a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui +++ b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSelectDatabaseDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KSelectDatabaseDlgDecl</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -50,7 +50,7 @@ As always, please make sure you have adequate backups of your data.</font> </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -61,14 +61,14 @@ As always, please make sure you have adequate backups of your data.</font> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>listDrivers</cstring> </property> </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -79,14 +79,14 @@ As always, please make sure you have adequate backups of your data.</font> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>textDbName</cstring> </property> </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -97,14 +97,14 @@ As always, please make sure you have adequate backups of your data.</font> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>textHostName</cstring> </property> </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -115,14 +115,14 @@ As always, please make sure you have adequate backups of your data.</font> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>textUserName</cstring> </property> </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBoxPassword</cstring> </property> @@ -133,7 +133,7 @@ As always, please make sure you have adequate backups of your data.</font> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>textPassword</cstring> </property> @@ -143,7 +143,7 @@ As always, please make sure you have adequate backups of your data.</font> </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkPreLoad</cstring> </property> @@ -151,15 +151,15 @@ As always, please make sure you have adequate backups of your data.</font> <string>Preload &all data</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -177,14 +177,14 @@ As always, please make sure you have adequate backups of your data.</font> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonSQL</cstring> </property> @@ -202,14 +202,14 @@ As always, please make sure you have adequate backups of your data.</font> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOK</cstring> </property> @@ -220,7 +220,7 @@ As always, please make sure you have adequate backups of your data.</font> <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -246,5 +246,5 @@ As always, please make sure you have adequate backups of your data.</font> <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kselecttransactionsdlg.cpp b/kmymoney2/dialogs/kselecttransactionsdlg.cpp index 7a87dc8..1b21089 100644 --- a/kmymoney2/dialogs/kselecttransactionsdlg.cpp +++ b/kmymoney2/dialogs/kselecttransactionsdlg.cpp @@ -36,8 +36,8 @@ #include "kmergetransactionsdlg.h" -KSelectTransactionsDlg::KSelectTransactionsDlg(const MyMoneyAccount& _account, QWidget* parent, const char* name) : - KSelectTransactionsDlgDecl(parent, name), +KSelectTransactionsDlg::KSelectTransactionsDlg(const MyMoneyAccount& _account, TQWidget* tqparent, const char* name) : + KSelectTransactionsDlgDecl(tqparent, name), m_account(_account) { // setup descriptive texts @@ -48,11 +48,11 @@ KSelectTransactionsDlg::KSelectTransactionsDlg(const MyMoneyAccount& _account, Q m_register->clear(); // no selection possible - m_register->setSelectionMode(QTable::Single); + m_register->setSelectionMode(TQTable::Single); // setup header font - QFont font = KMyMoneyGlobalSettings::listHeaderFont(); - QFontMetrics fm( font ); + TQFont font = KMyMoneyGlobalSettings::listHeaderFont(); + TQFontMetrics fm( font ); int height = fm.lineSpacing()+6; m_register->horizontalHeader()->setMinimumHeight(height); m_register->horizontalHeader()->setMaximumHeight(height); @@ -76,10 +76,10 @@ KSelectTransactionsDlg::KSelectTransactionsDlg(const MyMoneyAccount& _account, Q // catch some events from the register m_register->installEventFilter(this); - connect(m_register, SIGNAL(selectionChanged(const KMyMoneyRegister::SelectedTransactions&)), this, SLOT(slotEnableOk(const KMyMoneyRegister::SelectedTransactions&))); - connect(m_register, SIGNAL(editTransaction()), this, SLOT(accept())); + connect(m_register, TQT_SIGNAL(selectionChanged(const KMyMoneyRegister::SelectedTransactions&)), this, TQT_SLOT(slotEnableOk(const KMyMoneyRegister::SelectedTransactions&))); + connect(m_register, TQT_SIGNAL(editTransaction()), this, TQT_SLOT(accept())); - connect(m_helpButton, SIGNAL(clicked()), this, SLOT(slotHelp())); + connect(m_helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp())); } void KSelectTransactionsDlg::slotEnableOk(const KMyMoneyRegister::SelectedTransactions& list) @@ -89,7 +89,7 @@ void KSelectTransactionsDlg::slotEnableOk(const KMyMoneyRegister::SelectedTransa void KSelectTransactionsDlg::addTransaction(const MyMoneyTransaction& t) { - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; for(it_s = t.splits().begin(); it_s != t.splits().end(); ++it_s) { if((*it_s).accountId() == m_account.id()) { KMyMoneyRegister::Transaction* tr = KMyMoneyRegister::Register::transactionFactory(m_register, t, (*it_s), 0); @@ -121,7 +121,7 @@ void KSelectTransactionsDlg::show(void) m_register->resize(KMyMoneyRegister::DetailColumn); } -void KSelectTransactionsDlg::resizeEvent(QResizeEvent* ev) +void KSelectTransactionsDlg::resizeEvent(TQResizeEvent* ev) { // don't forget the resizer KSelectTransactionsDlgDecl::resizeEvent(ev); @@ -134,7 +134,7 @@ MyMoneyTransaction KSelectTransactionsDlg::transaction(void) const { MyMoneyTransaction t; - QValueList<KMyMoneyRegister::RegisterItem*> list; + TQValueList<KMyMoneyRegister::RegisterItem*> list; list = m_register->selectedItems(); if(list.count()) { KMyMoneyRegister::Transaction* _t = dynamic_cast<KMyMoneyRegister::Transaction*>(list[0]); @@ -144,19 +144,19 @@ MyMoneyTransaction KSelectTransactionsDlg::transaction(void) const return t; } -bool KSelectTransactionsDlg::eventFilter(QObject* o, QEvent* e) +bool KSelectTransactionsDlg::eventFilter(TQObject* o, TQEvent* e) { bool rc = false; - QKeyEvent* k; + TQKeyEvent* k; - if(o == m_register) { + if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_register)) { switch(e->type()) { - case QEvent::KeyPress: - k = dynamic_cast<QKeyEvent*>(e); - if((k->state() & Qt::KeyButtonMask) == 0) { + case TQEvent::KeyPress: + k = dynamic_cast<TQKeyEvent*>(e); + if((k->state() & TQt::KeyButtonMask) == 0) { switch(k->key()) { - case Qt::Key_Return: - case Qt::Key_Enter: + case TQt::Key_Return: + case TQt::Key_Enter: if(buttonOk->isEnabled()) { accept(); rc = true; diff --git a/kmymoney2/dialogs/kselecttransactionsdlg.h b/kmymoney2/dialogs/kselecttransactionsdlg.h index 7bab9eb..8a2e73b 100644 --- a/kmymoney2/dialogs/kselecttransactionsdlg.h +++ b/kmymoney2/dialogs/kselecttransactionsdlg.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- // QT Includes -class QResizeEvent; +class TQResizeEvent; // ---------------------------------------------------------------------------- // KDE Includes @@ -39,8 +39,9 @@ class QResizeEvent; class KSelectTransactionsDlg: public KSelectTransactionsDlgDecl { Q_OBJECT + TQ_OBJECT public: - KSelectTransactionsDlg(const MyMoneyAccount& account, QWidget* parent = 0, const char* name = 0); + KSelectTransactionsDlg(const MyMoneyAccount& account, TQWidget* tqparent = 0, const char* name = 0); /** * Adds the transaction @a t to the dialog @@ -51,7 +52,7 @@ public: MyMoneyTransaction transaction(void) const; - bool eventFilter(QObject* o, QEvent* e); + bool eventFilter(TQObject* o, TQEvent* e); public slots: virtual void slotHelp(); @@ -60,7 +61,7 @@ protected slots: void slotEnableOk(const KMyMoneyRegister::SelectedTransactions& list); protected: - void resizeEvent(QResizeEvent* ev); + void resizeEvent(TQResizeEvent* ev); private: /** diff --git a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui index 76d825b..a8efa2c 100644 --- a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui +++ b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSelectTransactionsDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KSelectTransactionsDlgDecl</cstring> </property> @@ -97,9 +97,9 @@ <number>12</number> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>430</width> <height>20</height> @@ -170,5 +170,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/ksortoptiondlg.ui b/kmymoney2/dialogs/ksortoptiondlg.ui index e5606ae..6ffb91a 100644 --- a/kmymoney2/dialogs/ksortoptiondlg.ui +++ b/kmymoney2/dialogs/ksortoptiondlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSortOptionDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KSortOptionDlg</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_useDefault</cstring> </property> @@ -35,9 +35,9 @@ <cstring>m_sortOption</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>237</width> <height>20</height> @@ -117,13 +117,16 @@ <includes> <include location="local" impldecl="in implementation">ksortoptiondlg.ui.h</include> </includes> -<slots> - <slot>setSortOption( const QString & option, const QString & def )</slot> -</slots> +<Q_SLOTS> + <slot>setSortOption( const TQString & option, const TQString & def )</slot> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> - <function returnType="QString">sortOption( void ) const</function> + <function returnType="TQString">sortOption( void ) const</function> <function>hideDefaultButton( void )</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/transactionsortoption.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/ksortoptiondlg.ui.h b/kmymoney2/dialogs/ksortoptiondlg.ui.h index 62c26b7..322c147 100644 --- a/kmymoney2/dialogs/ksortoptiondlg.ui.h +++ b/kmymoney2/dialogs/ksortoptiondlg.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -26,7 +26,7 @@ void KSortOptionDlg::init() m_helpButton->setGuiItem(KStdGuiItem::help()); } -void KSortOptionDlg::setSortOption(const QString& option, const QString& def) +void KSortOptionDlg::setSortOption(const TQString& option, const TQString& def) { if(option.isEmpty()) { m_sortOption->setSettings(def); @@ -37,9 +37,9 @@ void KSortOptionDlg::setSortOption(const QString& option, const QString& def) } } -QString KSortOptionDlg::sortOption(void) const +TQString KSortOptionDlg::sortOption(void) const { - QString rc; + TQString rc; if(!m_useDefault->isChecked()) { rc = m_sortOption->settings(); } diff --git a/kmymoney2/dialogs/ksplitcorrectiondlg.ui b/kmymoney2/dialogs/ksplitcorrectiondlg.ui index f5d9757..e37789e 100644 --- a/kmymoney2/dialogs/ksplitcorrectiondlg.ui +++ b/kmymoney2/dialogs/ksplitcorrectiondlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSplitCorrectionDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KSplitCorrectionDlgDecl</cstring> </property> @@ -12,7 +12,7 @@ <height>292</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>0</height> @@ -31,9 +31,9 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> @@ -50,7 +50,7 @@ <string>xxx</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>question</cstring> </property> @@ -61,7 +61,7 @@ <string>How do you want to proceed?</string> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup</cstring> </property> @@ -81,7 +81,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>continueBtn</cstring> </property> @@ -92,7 +92,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>changeBtn</cstring> </property> @@ -100,7 +100,7 @@ <string>Change total amount of transaction to %1.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>distributeBtn</cstring> </property> @@ -111,7 +111,7 @@ <string>Distribute difference of %1 among all splits.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>leaveBtn</cstring> </property> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>41</height> @@ -154,9 +154,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> @@ -191,7 +191,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>0</height> @@ -213,7 +213,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>0</height> @@ -241,5 +241,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/ksplittransactiondlg.cpp b/kmymoney2/dialogs/ksplittransactiondlg.cpp index a197b4c..9236bea 100644 --- a/kmymoney2/dialogs/ksplittransactiondlg.cpp +++ b/kmymoney2/dialogs/ksplittransactiondlg.cpp @@ -23,14 +23,14 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qpushbutton.h> -#include <qlabel.h> -#include <qtable.h> -#include <qtimer.h> -#include <qptrlist.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qcursor.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqtable.h> +#include <tqtimer.h> +#include <tqptrlist.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqcursor.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -61,9 +61,9 @@ KSplitTransactionDlg::KSplitTransactionDlg(const MyMoneyTransaction& t, const bool amountValid, const bool deposit, const MyMoneyMoney& calculatedValue, - const QMap<QString, MyMoneyMoney>& priceInfo, - QWidget* parent, const char* name) : - KSplitTransactionDlgDecl(parent, name, true), + const TQMap<TQString, MyMoneyMoney>& priceInfo, + TQWidget* tqparent, const char* name) : + KSplitTransactionDlgDecl(tqparent, name, true), m_account(acc), m_split(s), m_precision(2), @@ -75,14 +75,14 @@ KSplitTransactionDlg::KSplitTransactionDlg(const MyMoneyTransaction& t, KIconLoader *il = KGlobal::iconLoader(); KGuiItem clearButtenItem( i18n( "Clear &All" ), - QIconSet(il->loadIcon("edittrash", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("edittrash", KIcon::Small, KIcon::SizeSmall)), i18n("Clear all splits"), i18n("Use this to clear all splits of this transaction")); clearAllBtn->setGuiItem(clearButtenItem); KGuiItem mergeButtenItem( i18n( "&Merge" ), - QIconSet(il->loadIcon("math_sum", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("math_sum", KIcon::Small, KIcon::SizeSmall)), "", ""); mergeBtn->setGuiItem(mergeButtenItem); @@ -90,24 +90,24 @@ KSplitTransactionDlg::KSplitTransactionDlg(const MyMoneyTransaction& t, finishBtn->setDefault(true); // setup the focus - cancelBtn->setFocusPolicy(QWidget::NoFocus); - finishBtn->setFocusPolicy(QWidget::NoFocus); - clearAllBtn->setFocusPolicy(QWidget::NoFocus); + cancelBtn->setFocusPolicy(TQ_NoFocus); + finishBtn->setFocusPolicy(TQ_NoFocus); + clearAllBtn->setFocusPolicy(TQ_NoFocus); // connect signals with slots - connect(transactionsTable, SIGNAL(transactionChanged(const MyMoneyTransaction&)), - this, SLOT(slotSetTransaction(const MyMoneyTransaction&))); - connect(transactionsTable, SIGNAL(createCategory(const QString&, QString&)), this, SLOT(slotCreateCategory(const QString&, QString&))); - connect(transactionsTable, SIGNAL(objectCreation(bool)), this, SIGNAL(objectCreation(bool))); + connect(transactionsTable, TQT_SIGNAL(transactionChanged(const MyMoneyTransaction&)), + this, TQT_SLOT(slotSetTransaction(const MyMoneyTransaction&))); + connect(transactionsTable, TQT_SIGNAL(createCategory(const TQString&, TQString&)), this, TQT_SLOT(slotCreateCategory(const TQString&, TQString&))); + connect(transactionsTable, TQT_SIGNAL(objectCreation(bool)), this, TQT_SIGNAL(objectCreation(bool))); - connect(transactionsTable, SIGNAL(returnPressed()), this, SLOT(accept())); - connect(transactionsTable, SIGNAL(escapePressed()), this, SLOT(reject())); + connect(transactionsTable, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(accept())); + connect(transactionsTable, TQT_SIGNAL(escapePressed()), this, TQT_SLOT(reject())); - connect(cancelBtn, SIGNAL(clicked()), this, SLOT(reject())); - connect(finishBtn, SIGNAL(clicked()), this, SLOT(accept())); - connect(clearAllBtn, SIGNAL(clicked()), this, SLOT(slotClearAllSplits())); - connect(mergeBtn, SIGNAL(clicked()), this, SLOT(slotMergeSplits())); - connect(clearZeroBtn, SIGNAL(clicked()), this, SLOT(slotClearUnusedSplits())); + connect(cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(finishBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect(clearAllBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClearAllSplits())); + connect(mergeBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMergeSplits())); + connect(clearZeroBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClearUnusedSplits())); // setup the precision try { @@ -122,11 +122,11 @@ KSplitTransactionDlg::KSplitTransactionDlg(const MyMoneyTransaction& t, // pass on those vars transactionsTable->setup(priceInfo); - QSize size(width(), height()); + TQSize size(width(), height()); kapp->config()->setGroup("SplitTransactionEditor"); size = kapp->config()->readSizeEntry("Geometry", &size); size.setHeight(size.height()-1); - QDialog::resize( size.expandedTo(minimumSizeHint()) ); + TQDialog::resize( size.expandedTo(tqminimumSizeHint()) ); // Trick: it seems, that the initial sizing of the dialog does // not work correctly. At least, the columns do not get displayed @@ -134,7 +134,7 @@ KSplitTransactionDlg::KSplitTransactionDlg(const MyMoneyTransaction& t, // is incorrect. If the widget is visible, resizing works correctly. // So, we let the dialog show up and resize it then. It's not really // clean, but the only way I got the damned thing working. - QTimer::singleShot( 10, this, SLOT(initSize()) ); + TQTimer::singleShot( 10, this, TQT_SLOT(initSize()) ); } KSplitTransactionDlg::~KSplitTransactionDlg() @@ -166,7 +166,7 @@ int KSplitTransactionDlg::exec(void) rc = KSplitTransactionDlgDecl::exec(); - if(rc == QDialog::Accepted) { + if(rc == TQDialog::Accepted) { if(!diffAmount().isZero()) { KSplitCorrectionDlgDecl* corrDlg = new KSplitCorrectionDlgDecl(this, 0, true); @@ -175,23 +175,23 @@ int KSplitTransactionDlg::exec(void) corrDlg->cancelBtn->setGuiItem(KStdGuiItem::cancel()); MyMoneySplit split = m_transaction.splits()[0]; - QString total = (-split.value()).formatMoney("", m_precision); - QString sums = splitsValue().formatMoney("", m_precision); - QString diff = diffAmount().formatMoney("", m_precision); + TQString total = (-split.value()).formatMoney("", m_precision); + TQString sums = splitsValue().formatMoney("", m_precision); + TQString diff = diffAmount().formatMoney("", m_precision); // now modify the text items of the dialog to contain the correct values - QString q = i18n("The total amount of this transaction is %1 while " + TQString q = i18n("The total amount of this transaction is %1 while " "the sum of the splits is %2. The remaining %3 are " "unassigned.") - .arg(total) - .arg(sums) - .arg(diff); + .tqarg(total) + .tqarg(sums) + .tqarg(diff); corrDlg->explanation->setText(q); - q = i18n("Change &total amount of transaction to %1.").arg(sums); + q = i18n("Change &total amount of transaction to %1.").tqarg(sums); corrDlg->changeBtn->setText(q); - q = i18n("&Distribute difference of %1 among all splits.").arg(diff); + q = i18n("&Distribute difference of %1 among all splits.").tqarg(diff); corrDlg->distributeBtn->setText(q); // FIXME remove the following line once distribution among // all splits is implemented @@ -200,18 +200,18 @@ int KSplitTransactionDlg::exec(void) // if we have only two splits left, we don't allow leaving sth. unassigned. if(m_transaction.splitCount() < 3) { - q = i18n("&Leave total amount of transaction at %1.").arg(total); + q = i18n("&Leave total amount of transaction at %1.").tqarg(total); } else { - q = i18n("&Leave %1 unassigned.").arg(diff); + q = i18n("&Leave %1 unassigned.").tqarg(diff); } corrDlg->leaveBtn->setText(q); - if((rc = corrDlg->exec()) == QDialog::Accepted) { - QButton* button = corrDlg->buttonGroup->selected(); + if((rc = corrDlg->exec()) == TQDialog::Accepted) { + TQButton* button = corrDlg->buttonGroup->selected(); if(button != 0) { switch(corrDlg->buttonGroup->id(button)) { case 0: // continue to edit - rc = QDialog::Rejected; + rc = TQDialog::Rejected; break; case 1: // modify total @@ -234,7 +234,7 @@ int KSplitTransactionDlg::exec(void) } else break; - } while(rc != QDialog::Accepted); + } while(rc != TQDialog::Accepted); // for deposits, we inverted the sign of all splits. // now we revert it back, so that things are left correct @@ -252,7 +252,7 @@ int KSplitTransactionDlg::exec(void) void KSplitTransactionDlg::initSize(void) { - QDialog::resize(width(), height()+1); + TQDialog::resize(width(), height()+1); } void KSplitTransactionDlg::accept() @@ -281,8 +281,8 @@ void KSplitTransactionDlg::slotClearAllSplits(void) if(answer == KMessageBox::Continue) { transactionsTable->slotCancelEdit(); - QValueList<MyMoneySplit> list = transactionsTable->getSplits(m_transaction); - QValueList<MyMoneySplit>::ConstIterator it; + TQValueList<MyMoneySplit> list = transactionsTable->getSplits(m_transaction); + TQValueList<MyMoneySplit>::ConstIterator it; // clear all but the one referencing the account for(it = list.begin(); it != list.end(); ++it) { @@ -298,8 +298,8 @@ void KSplitTransactionDlg::slotClearUnusedSplits(void) { transactionsTable->slotEndEdit(); - QValueList<MyMoneySplit> list = transactionsTable->getSplits(m_transaction); - QValueList<MyMoneySplit>::ConstIterator it; + TQValueList<MyMoneySplit> list = transactionsTable->getSplits(m_transaction); + TQValueList<MyMoneySplit>::ConstIterator it; try { // remove all splits that don't have a value assigned @@ -320,14 +320,14 @@ void KSplitTransactionDlg::slotMergeSplits(void) { transactionsTable->slotEndEdit(); - QValueList<MyMoneySplit> list = transactionsTable->getSplits(m_transaction); - QValueList<MyMoneySplit>::ConstIterator it; + TQValueList<MyMoneySplit> list = transactionsTable->getSplits(m_transaction); + TQValueList<MyMoneySplit>::ConstIterator it; try { // collect all splits, merge them if needed and remove from transaction - QValueList<MyMoneySplit> splits; + TQValueList<MyMoneySplit> splits; for(it = list.begin(); it != list.end(); ++it) { - QValueList<MyMoneySplit>::iterator it_s; + TQValueList<MyMoneySplit>::iterator it_s; for(it_s = splits.begin(); it_s != splits.end(); ++it_s) { if((*it_s).accountId() == (*it).accountId() && (*it_s).memo().isEmpty() && (*it).memo().isEmpty()) @@ -343,7 +343,7 @@ void KSplitTransactionDlg::slotMergeSplits(void) } // now add them back to the transaction - QValueList<MyMoneySplit>::iterator it_s; + TQValueList<MyMoneySplit>::iterator it_s; for(it_s = splits.begin(); it_s != splits.end(); ++it_s) { (*it_s).clearId(); m_transaction.addSplit(*it_s); @@ -361,18 +361,18 @@ void KSplitTransactionDlg::slotSetTransaction(const MyMoneyTransaction& t) transactionsTable->slotCancelEdit(); m_transaction = t; - QValueList<MyMoneySplit> list = transactionsTable->getSplits(m_transaction); - QValueList<MyMoneySplit>::ConstIterator it; + TQValueList<MyMoneySplit> list = transactionsTable->getSplits(m_transaction); + TQValueList<MyMoneySplit>::ConstIterator it; // check if we can merge splits or not, have zero splits or not - QMap<QString, int> splits; + TQMap<TQString, int> splits; bool haveZeroSplit = false; for(it = list.begin(); it != list.end(); ++it) { splits[(*it).accountId()]++; if(((*it).id() != m_split.id()) && ((*it).shares().isZero())) haveZeroSplit = true; } - QMap<QString, int>::const_iterator it_s; + TQMap<TQString, int>::const_iterator it_s; for(it_s = splits.begin(); it_s != splits.end(); ++it_s) { if((*it_s) > 1) break; @@ -400,8 +400,8 @@ void KSplitTransactionDlg::updateSums(void) MyMoneyMoney KSplitTransactionDlg::splitsValue(void) { MyMoneyMoney splitsValue(m_calculatedValue); - QValueList<MyMoneySplit> list = transactionsTable->getSplits(m_transaction); - QValueList<MyMoneySplit>::ConstIterator it; + TQValueList<MyMoneySplit> list = transactionsTable->getSplits(m_transaction); + TQValueList<MyMoneySplit>::ConstIterator it; // calculate the current sum of all split parts for(it = list.begin(); it != list.end(); ++it) { @@ -426,21 +426,21 @@ MyMoneyMoney KSplitTransactionDlg::diffAmount(void) return diff; } -void KSplitTransactionDlg::slotCreateCategory(const QString& name, QString& id) +void KSplitTransactionDlg::slotCreateCategory(const TQString& name, TQString& id) { - MyMoneyAccount acc, parent; + MyMoneyAccount acc, tqparent; acc.setName(name); if(m_isDeposit) - parent = MyMoneyFile::instance()->income(); + tqparent = MyMoneyFile::instance()->income(); else - parent = MyMoneyFile::instance()->expense(); + tqparent = MyMoneyFile::instance()->expense(); // TODO extract possible first part of a hierarchy and check if it is one - // of our top categories. If so, remove it and select the parent + // of our top categories. If so, remove it and select the tqparent // according to this information. - emit createCategory(acc, parent); + emit createCategory(acc, tqparent); // return id id = acc.id(); diff --git a/kmymoney2/dialogs/ksplittransactiondlg.h b/kmymoney2/dialogs/ksplittransactiondlg.h index 67a5b92..76261bd 100644 --- a/kmymoney2/dialogs/ksplittransactiondlg.h +++ b/kmymoney2/dialogs/ksplittransactiondlg.h @@ -51,6 +51,7 @@ class kMyMoneyLineEdit; class KSplitTransactionDlg : public KSplitTransactionDlgDecl { Q_OBJECT + TQ_OBJECT public: KSplitTransactionDlg(const MyMoneyTransaction& t, @@ -59,8 +60,8 @@ public: const bool amountValid, const bool deposit, const MyMoneyMoney& calculatedValue, - const QMap<QString, MyMoneyMoney>& priceInfo, - QWidget* parent = 0, const char* name = 0); + const TQMap<TQString, MyMoneyMoney>& priceInfo, + TQWidget* tqparent = 0, const char* name = 0); virtual ~KSplitTransactionDlg(); @@ -106,7 +107,7 @@ protected slots: void slotClearAllSplits(void); void slotClearUnusedSplits(void); void slotSetTransaction(const MyMoneyTransaction& t); - void slotCreateCategory(const QString& txt, QString& id); + void slotCreateCategory(const TQString& txt, TQString& id); void slotMergeSplits(void); /// used internally to setup the initial size of all widgets @@ -115,13 +116,13 @@ protected slots: signals: /** * This signal is sent out, when a new category needs to be created - * Depending on the setting of either a payment or deposit, the parent + * Depending on the setting of either a payment or deposit, the tqparent * account will be preset to Expense or Income. * * @param account reference to account info. Will be filled by called slot - * @param parent reference to parent account + * @param tqparent reference to tqparent account */ - void createCategory(MyMoneyAccount& account, const MyMoneyAccount& parent); + void createCategory(MyMoneyAccount& account, const MyMoneyAccount& tqparent); /** * Signal is emitted, if any of the widgets enters (@a state equals @a true) diff --git a/kmymoney2/dialogs/ksplittransactiondlgdecl.ui b/kmymoney2/dialogs/ksplittransactiondlgdecl.ui index 72a19e3..2d2f231 100644 --- a/kmymoney2/dialogs/ksplittransactiondlgdecl.ui +++ b/kmymoney2/dialogs/ksplittransactiondlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSplitTransactionDlgDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KSplitTransactionDlgDecl</cstring> </property> @@ -28,7 +28,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout61</cstring> </property> @@ -58,7 +58,7 @@ <cursor>0</cursor> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_sumFrame</cstring> </property> @@ -88,18 +88,18 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout49</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>80</height> @@ -115,7 +115,7 @@ <property name="spacing"> <number>1</number> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>splitUnassigned</cstring> </property> @@ -127,7 +127,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>15</height> @@ -136,13 +136,13 @@ <property name="text"> <string><b>11,00<b></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>transactionAmount</cstring> </property> @@ -154,7 +154,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>15</height> @@ -163,13 +163,13 @@ <property name="text"> <string><b>111,00<b></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -181,13 +181,13 @@ <property name="text"> <string>Unassigned</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -199,13 +199,13 @@ <property name="text"> <string>Sum of splits</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>splitSum</cstring> </property> @@ -217,7 +217,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>15</height> @@ -226,17 +226,17 @@ <property name="text"> <string>100,00</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel1_2_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -250,7 +250,7 @@ <property name="text"> <string>Transaction amount</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -272,7 +272,7 @@ </widget> </grid> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3</cstring> </property> @@ -284,13 +284,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>15</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>80</height> @@ -307,9 +307,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> @@ -364,7 +364,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>120</height> @@ -420,5 +420,5 @@ <data format="PNG" length="256">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000c749444154388dad55db1184200c4c180bb81a28c73aad811228c356f42b3792db3cc0db2fc724bb7901dc7b270f27ed17fa5fa9b117b7cd90211f4ba0ac906a7f1453b4d30ca917bb590681552af23f69bfc4ffa71519d2c8f62546ea5ea03738b1c18c33a4d156f0d13f43b61952e4af6d6e8fb3a408f080448419a433d6486d85052fdba892a295f5d45785cd8c51a9d6de6a814a8d2131da51f98e7a3b64ec9da04a8db53d43be3c3c0b22cacf17e4cdb5a931649ceddf34b190cf0aa019f03f1fd3e7457f03b5a66c9ed26e86130000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/kstartdlg.cpp b/kmymoney2/dialogs/kstartdlg.cpp index d0af8eb..afdef28 100644 --- a/kmymoney2/dialogs/kstartdlg.cpp +++ b/kmymoney2/dialogs/kstartdlg.cpp @@ -18,24 +18,20 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qvbox.h> -#include <qlayout.h> -#include <qbuttongroup.h> -#include <qabstractlayout.h> -#include <qpixmap.h> -#include <qtextview.h> -#include <qlabel.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqbuttongroup.h> +#include <tqabstractlayout.h> +#include <tqpixmap.h> +#include <tqtextview.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes #include "kdecompat.h" -#if QT_VERSION > 300 #include <kstandarddirs.h> -#else -#include <kstddirs.h> -#endif #include <kiconloader.h> #include <kconfig.h> @@ -54,9 +50,9 @@ #include "krecentfileitem.h" #include "../kmymoney2.h" -#include <qtooltip.h> +#include <tqtooltip.h> -KStartDlg::KStartDlg(QWidget *parent, const char *name, bool modal) : KDialogBase(IconList,i18n("Start Dialog"),Help|Ok|Cancel,Ok, parent, name, modal, true) +KStartDlg::KStartDlg(TQWidget *tqparent, const char *name, bool modal) : KDialogBase(IconList,i18n("Start Dialog"),Help|Ok|Cancel,Ok, tqparent, name, modal, true) { setPage_Template(); setPage_Documents(); @@ -77,41 +73,41 @@ void KStartDlg::setPage_Template() KIconLoader *ic = KGlobal::iconLoader(); templateMainFrame = addVBoxPage( i18n("Templates"), i18n("Select templates"), DesktopIcon("wizard")); view_wizard = new KIconView( templateMainFrame, "view_options" ); - (void)new QIconViewItem( view_wizard, i18n("New KMyMoney document"), ic->loadIcon("mime_empty.png", KIcon::Desktop, KIcon::SizeLarge)/*QPixmap( locate("icon","hicolor/48x48/mimetypes/mime_empty.png") )*/ ); - connect(view_wizard, SIGNAL(executed(QIconViewItem *) ), this, SLOT(slotTemplateClicked(QIconViewItem *) ) ); - connect(view_wizard, SIGNAL(selectionChanged(QIconViewItem*)), - this, SLOT(slotTemplateSelectionChanged(QIconViewItem*))); - connect(this, SIGNAL(aboutToShowPage(QWidget*)), this, SLOT(slotAboutToShowPage(QWidget*))); + (void)new TQIconViewItem( view_wizard, i18n("New KMyMoney document"), ic->loadIcon("mime_empty.png", KIcon::Desktop, KIcon::SizeLarge)/*TQPixmap( locate("icon","hicolor/48x48/mimetypes/mime_empty.png") )*/ ); + connect(view_wizard, TQT_SIGNAL(executed(TQIconViewItem *) ), this, TQT_SLOT(slotTemplateClicked(TQIconViewItem *) ) ); + connect(view_wizard, TQT_SIGNAL(selectionChanged(TQIconViewItem*)), + this, TQT_SLOT(slotTemplateSelectionChanged(TQIconViewItem*))); + connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotAboutToShowPage(TQWidget*))); } /** Set the Misc options Page of the preferences dialog */ void KStartDlg::setPage_Documents() { recentMainFrame = addPage( i18n("Open"), i18n("Open a KMyMoney document"), DesktopIcon("fileopen")); - QVBoxLayout *mainLayout = new QVBoxLayout( recentMainFrame ); + TQVBoxLayout *mainLayout = new TQVBoxLayout( recentMainFrame ); kurlrequest = new KURLRequester( recentMainFrame, "kurlrequest" ); //allow user to select either a .kmy file, or any generic file. - kurlrequest->fileDialog()->setFilter( i18n("%1|KMyMoney files (*.kmy)\n" "%2|All files (*.*)").arg("*.kmy").arg("*.*") ); + kurlrequest->fileDialog()->setFilter( i18n("%1|KMyMoney files (*.kmy)\n" "%2|All files (*.*)").tqarg("*.kmy").tqarg("*.*") ); kurlrequest->fileDialog()->setMode(KFile::File || KFile::ExistingOnly); kurlrequest->fileDialog()->setURL(KURL(kmymoney2->readLastUsedDir()));//kurlrequest->fileDialog()->setURL(KURL(KGlobalSettings::documentPath())); mainLayout->addWidget( kurlrequest ); - QLabel *label1 = new QLabel( recentMainFrame, "label1" ); + TQLabel *label1 = new TQLabel( recentMainFrame, "label1" ); label1->setText( i18n("Recent Files") ); mainLayout->addWidget( label1 ); view_recent = new KIconView( recentMainFrame, "view_recent" ); - connect( view_recent, SIGNAL( executed(QIconViewItem *) ), this, SLOT( slotRecentClicked(QIconViewItem *) ) ); + connect( view_recent, TQT_SIGNAL( executed(TQIconViewItem *) ), this, TQT_SLOT( slotRecentClicked(TQIconViewItem *) ) ); mainLayout->addWidget( view_recent ); view_recent->setArrangement(KIconView::LeftToRight/*TopToBottom*/); view_recent->setItemTextPos(KIconView::Bottom); - connect(view_recent, SIGNAL(selectionChanged(QIconViewItem*)), - this, SLOT(slotRecentSelectionChanged(QIconViewItem*))); + connect(view_recent, TQT_SIGNAL(selectionChanged(TQIconViewItem*)), + this, TQT_SLOT(slotRecentSelectionChanged(TQIconViewItem*))); } -void KStartDlg::slotTemplateClicked(QIconViewItem *item) +void KStartDlg::slotTemplateClicked(TQIconViewItem *item) { if(!item) return; @@ -129,7 +125,7 @@ void KStartDlg::slotTemplateClicked(QIconViewItem *item) /** Read config window */ void KStartDlg::readConfig() { - QString value; + TQString value; unsigned int i = 1; KConfig *config = KGlobal::config(); @@ -142,17 +138,17 @@ void KStartDlg::readConfig() // it does not make a difference, if you call setGroup() outside of // this loop. The first time it does make a difference! config->setGroup("Recent Files"); - value = config->readEntry( QString( "File%1" ).arg( i ), QString::null ); + value = config->readEntry( TQString( "File%1" ).tqarg( i ), TQString() ); if( !value.isNull() && fileExists(value) ) { - QString file_name = value.mid(value.findRev('/')+1); + TQString file_name = value.mid(value.tqfindRev('/')+1); (void)new KRecentFileItem( value, view_recent, file_name, il->loadIcon("kmy", KIcon::Desktop, KIcon::SizeLarge)); } i++; } while( !value.isNull() ); config->setGroup("Start Dialog"); - QSize *defaultSize = new QSize(400,300); + TQSize *defaultSize = new TQSize(400,300); this->resize( config->readSizeEntry("Geometry", defaultSize ) ); // Restore the last page viewed @@ -178,7 +174,7 @@ void KStartDlg::writeConfig() } /** slot to recent view */ -void KStartDlg::slotRecentClicked(QIconViewItem *item) +void KStartDlg::slotRecentClicked(TQIconViewItem *item) { KRecentFileItem *kitem = (KRecentFileItem*)item; if(!kitem) return; @@ -205,7 +201,7 @@ bool KStartDlg::fileExists(KURL url) #endif } -void KStartDlg::slotTemplateSelectionChanged(QIconViewItem* item) +void KStartDlg::slotTemplateSelectionChanged(TQIconViewItem* item) { if(!item) return; @@ -222,7 +218,7 @@ void KStartDlg::slotTemplateSelectionChanged(QIconViewItem* item) isopenfile = false; } -void KStartDlg::slotRecentSelectionChanged(QIconViewItem* item) +void KStartDlg::slotRecentSelectionChanged(TQIconViewItem* item) { KRecentFileItem *kitem = (KRecentFileItem*)item; if(!kitem) return; @@ -235,7 +231,7 @@ void KStartDlg::slotRecentSelectionChanged(QIconViewItem* item) kurlrequest->setURL( kitem->fileURL() ); } -void KStartDlg::slotAboutToShowPage(QWidget* page) +void KStartDlg::slotAboutToShowPage(TQWidget* page) { enableButtonOK(page == recentMainFrame); } diff --git a/kmymoney2/dialogs/kstartdlg.h b/kmymoney2/dialogs/kstartdlg.h index a09f72d..55d6955 100644 --- a/kmymoney2/dialogs/kstartdlg.h +++ b/kmymoney2/dialogs/kstartdlg.h @@ -27,27 +27,28 @@ #include <kurlrequester.h> #include <kiconview.h> -#include <qstring.h> -#include <qradiobutton.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qpushbutton.h> +#include <tqstring.h> +#include <tqradiobutton.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> /**KMyMoney 2 start dialog */ class KStartDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KStartDlg( QWidget *parent=0, const char *name=0, bool modal=true ); + KStartDlg( TQWidget *tqparent=0, const char *name=0, bool modal=true ); virtual ~KStartDlg(); bool isNewFile(void) const { return isnewfile; } bool isOpenFile(void) const { return !kurlrequest->url().isEmpty(); } - const QString getURL(void) const { return kurlrequest->url(); } - QString getTemplateName(void) const { return templatename; } + const TQString getURL(void) const { return kurlrequest->url(); } + TQString getTemplateName(void) const { return templatename; } private: // Private methods - QString m_filename; + TQString m_filename; bool fileExists(KURL url); void setPage_Template(); @@ -63,22 +64,22 @@ private: // Private methods /** misc variables */ bool isnewfile; bool isopenfile; - QString templatename; - QVBox *templateMainFrame; - QFrame *recentMainFrame; + TQString templatename; + TQVBox *templateMainFrame; + TQFrame *recentMainFrame; protected slots: /** No descriptions */ void slotOk(); private slots: - void slotTemplateClicked(QIconViewItem *item); + void slotTemplateClicked(TQIconViewItem *item); /** slot to recent view */ - void slotRecentClicked(QIconViewItem *item); + void slotRecentClicked(TQIconViewItem *item); /** Handle selections */ - void slotTemplateSelectionChanged(QIconViewItem* item); - void slotRecentSelectionChanged(QIconViewItem* item); - void slotAboutToShowPage(QWidget* page); + void slotTemplateSelectionChanged(TQIconViewItem* item); + void slotRecentSelectionChanged(TQIconViewItem* item); + void slotAboutToShowPage(TQWidget* page); }; #endif diff --git a/kmymoney2/dialogs/kupdatestockpricedlg.cpp b/kmymoney2/dialogs/kupdatestockpricedlg.cpp index 05eee8a..ef7bfab 100644 --- a/kmymoney2/dialogs/kupdatestockpricedlg.cpp +++ b/kmymoney2/dialogs/kupdatestockpricedlg.cpp @@ -34,10 +34,10 @@ #include "kupdatestockpricedlg.h" #include "../widgets/kmymoneycurrencyselector.h" -KUpdateStockPriceDlg::KUpdateStockPriceDlg(QWidget* parent, const char* name) : - kUpdateStockPriceDecl(parent, name, true) +KUpdateStockPriceDlg::KUpdateStockPriceDlg(TQWidget* tqparent, const char* name) : + kUpdateStockPriceDecl(tqparent, name, true) { - m_date->setDate(QDate::currentDate()); + m_date->setDate(TQDate::tqcurrentDate()); init(); } @@ -50,15 +50,15 @@ void KUpdateStockPriceDlg::init() m_okButton->setGuiItem(KStdGuiItem::ok()); m_cancelButton->setGuiItem(KStdGuiItem::cancel()); - connect(m_okButton, SIGNAL(clicked()), this, SLOT(accept())); - connect(m_cancelButton, SIGNAL(clicked()), this, SLOT(reject())); + connect(m_okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect(m_cancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); - connect(m_security, SIGNAL(activated(int)), this, SLOT(slotCheckData())); - connect(m_currency, SIGNAL(activated(int)), this, SLOT(slotCheckData())); + connect(m_security, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotCheckData())); + connect(m_currency, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotCheckData())); // load initial values into the selection widgets - m_currency->update(QString()); - m_security->update(QString()); + m_currency->update(TQString()); + m_security->update(TQString()); slotCheckData(); } @@ -71,8 +71,8 @@ int KUpdateStockPriceDlg::exec(void) void KUpdateStockPriceDlg::slotCheckData(void) { - QString from = m_security->security().id(); - QString to = m_currency->security().id(); + TQString from = m_security->security().id(); + TQString to = m_currency->security().id(); m_okButton->setEnabled(!from.isEmpty() && !to.isEmpty() && from != to); } diff --git a/kmymoney2/dialogs/kupdatestockpricedlg.h b/kmymoney2/dialogs/kupdatestockpricedlg.h index c7dd407..ed75120 100644 --- a/kmymoney2/dialogs/kupdatestockpricedlg.h +++ b/kmymoney2/dialogs/kupdatestockpricedlg.h @@ -31,7 +31,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qdatetime.h> +#include <tqdatetime.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -55,12 +55,13 @@ class KUpdateStockPriceDlg : public kUpdateStockPriceDecl { Q_OBJECT + TQ_OBJECT public: - KUpdateStockPriceDlg(QWidget* parent = NULL, const char* name = NULL); + KUpdateStockPriceDlg(TQWidget* tqparent = NULL, const char* name = NULL); ~KUpdateStockPriceDlg(); - const QDate date() const { return m_date->date(); }; + const TQDate date() const { return m_date->date(); }; const MyMoneyMoney price(void) const; public slots: diff --git a/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui b/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui index d9770b2..1e41eaa 100644 --- a/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui +++ b/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>kUpdateStockPriceDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>kUpdateStockPriceDecl</cstring> </property> @@ -19,17 +19,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout38</cstring> + <cstring>tqlayout38</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>layout37</cstring> + <cstring>tqlayout37</cstring> </property> <hbox> <property name="name"> @@ -50,7 +50,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>21</height> @@ -59,9 +59,9 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout36</cstring> + <cstring>tqlayout36</cstring> </property> <hbox> <property name="name"> @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -99,7 +99,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -107,7 +107,7 @@ <string>Currency</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblDate</cstring> </property> @@ -115,7 +115,7 @@ <string>Date:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -123,9 +123,9 @@ <string>Security</string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout35</cstring> + <cstring>tqlayout35</cstring> </property> <hbox> <property name="name"> @@ -154,7 +154,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>40</height> @@ -196,9 +196,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -214,7 +214,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>21</height> @@ -253,5 +253,8 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> +</includes> </UI> diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp index cc43ced..cdb7a34 100644 --- a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp +++ b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp @@ -18,11 +18,11 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qpushbutton.h> -#include <qlistbox.h> -#include <qlistview.h> -#include <qcheckbox.h> -#include <qtabwidget.h> +#include <tqpushbutton.h> +#include <tqlistbox.h> +#include <tqlistview.h> +#include <tqcheckbox.h> +#include <tqtabwidget.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -48,8 +48,8 @@ #include "mymoneyqifprofileeditor.h" -MyMoneyQifProfileNameValidator::MyMoneyQifProfileNameValidator(QObject *o, const char *name) - : QValidator(o, name) +MyMoneyQifProfileNameValidator::MyMoneyQifProfileNameValidator(TQObject *o, const char *name) + : TQValidator(o, name) { } @@ -57,26 +57,26 @@ MyMoneyQifProfileNameValidator::~MyMoneyQifProfileNameValidator() { } -QValidator::State MyMoneyQifProfileNameValidator::validate(QString& name, int&) const +TQValidator::State MyMoneyQifProfileNameValidator::validate(TQString& name, int&) const { KConfig* config = KGlobal::config(); config->setGroup("Profiles"); - QStringList list = config->readListEntry("profiles"); + TQStringList list = config->readListEntry("profiles"); // invalid character? - if(name.contains(",") != 0) - return QValidator::Invalid; + if(name.tqcontains(",") != 0) + return TQValidator::Invalid; // would not work in this form (empty or existing name) - if(name.isEmpty() || list.contains(name)) - return QValidator::Intermediate; + if(name.isEmpty() || list.tqcontains(name)) + return TQValidator::Intermediate; // is OK - return QValidator::Acceptable; + return TQValidator::Acceptable; } -MyMoneyQifProfileEditor::MyMoneyQifProfileEditor(const bool edit, QWidget *parent, const char *name ) - : MyMoneyQifProfileEditorDecl(parent,name), +MyMoneyQifProfileEditor::MyMoneyQifProfileEditor(const bool edit, TQWidget *tqparent, const char *name ) + : MyMoneyQifProfileEditorDecl(tqparent,name), m_inEdit(edit), m_isDirty(false), m_isAccepted(false), @@ -92,42 +92,42 @@ MyMoneyQifProfileEditor::MyMoneyQifProfileEditor(const bool edit, QWidget *paren // load button icons KIconLoader* il = KGlobal::iconLoader(); KGuiItem newButtenItem( i18n( "&New" ), - QIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), i18n("Create a new profile"), - i18n("Use this to create a new QIF import/export profile")); + i18n("Use this to create a new TQIF import/export profile")); m_newButton->setGuiItem(newButtenItem); - connect(m_profileListBox, SIGNAL(highlighted(const QString&)), this, SLOT(slotLoadProfileFromConfig(const QString&))); - connect(m_resetButton, SIGNAL(clicked()), this, SLOT(slotReset())); - connect(m_okButton, SIGNAL(clicked()), this, SLOT(slotOk())); - connect(m_renameButton, SIGNAL(clicked()), this, SLOT(slotRename())); - connect(m_deleteButton, SIGNAL(clicked()), this, SLOT(slotDelete())); - connect(m_newButton, SIGNAL(clicked()), this, SLOT(slotNew())); - connect(m_cancelButton, SIGNAL(clicked()), this, SLOT(reject())); - connect(m_helpButton, SIGNAL(clicked()), this, SLOT(slotHelp())); + connect(m_profileListBox, TQT_SIGNAL(highlighted(const TQString&)), this, TQT_SLOT(slotLoadProfileFromConfig(const TQString&))); + connect(m_resetButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReset())); + connect(m_okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOk())); + connect(m_renameButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRename())); + connect(m_deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelete())); + connect(m_newButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew())); + connect(m_cancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(m_helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp())); - connect(m_editDescription, SIGNAL(textChanged(const QString&)), &m_profile, SLOT(setProfileDescription(const QString&))); - connect(m_editType, SIGNAL(textChanged(const QString&)), &m_profile, SLOT(setProfileType(const QString&))); - connect(m_editOpeningBalance, SIGNAL(textChanged(const QString&)), &m_profile, SLOT(setOpeningBalanceText(const QString&))); - connect(m_editAccountDelimiter, SIGNAL(textChanged(const QString&)), &m_profile, SLOT(setAccountDelimiter(const QString&))); - connect(m_editVoidMark, SIGNAL(textChanged(const QString&)), &m_profile, SLOT(setVoidMark(const QString&))); + connect(m_editDescription, TQT_SIGNAL(textChanged(const TQString&)), &m_profile, TQT_SLOT(setProfileDescription(const TQString&))); + connect(m_editType, TQT_SIGNAL(textChanged(const TQString&)), &m_profile, TQT_SLOT(setProfileType(const TQString&))); + connect(m_editOpeningBalance, TQT_SIGNAL(textChanged(const TQString&)), &m_profile, TQT_SLOT(setOpeningBalanceText(const TQString&))); + connect(m_editAccountDelimiter, TQT_SIGNAL(textChanged(const TQString&)), &m_profile, TQT_SLOT(setAccountDelimiter(const TQString&))); + connect(m_editVoidMark, TQT_SIGNAL(textChanged(const TQString&)), &m_profile, TQT_SLOT(setVoidMark(const TQString&))); - //connect(m_editDateFormat, SIGNAL(highlighted(const QString&)), &m_profile, SLOT(setDateFormat(const QString&))); - connect(m_editApostrophe, SIGNAL(highlighted(const QString&)), &m_profile, SLOT(setApostropheFormat(const QString&))); + //connect(m_editDateFormat, TQT_SIGNAL(highlighted(const TQString&)), &m_profile, TQT_SLOT(setDateFormat(const TQString&))); + connect(m_editApostrophe, TQT_SIGNAL(highlighted(const TQString&)), &m_profile, TQT_SLOT(setApostropheFormat(const TQString&))); - connect(m_editAmounts, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotAmountTypeSelected(QListViewItem*))); - connect(m_decimalBox, SIGNAL(activated(const QString&)), this, SLOT(slotDecimalChanged(const QString&))); - connect(m_thousandsBox, SIGNAL(activated(const QString&)), this, SLOT(slotThousandsChanged(const QString&))); + connect(m_editAmounts, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotAmountTypeSelected(TQListViewItem*))); + connect(m_decimalBox, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotDecimalChanged(const TQString&))); + connect(m_thousandsBox, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotThousandsChanged(const TQString&))); - connect(m_editInputFilterLocation, SIGNAL(textChanged(const QString&)), &m_profile, SLOT(setFilterScriptImport(const QString&))); - connect(m_editInputFilterLocation, SIGNAL(urlSelected(const QString&)), m_editInputFilterLocation, SLOT(setURL(const QString&))); + connect(m_editInputFilterLocation, TQT_SIGNAL(textChanged(const TQString&)), &m_profile, TQT_SLOT(setFilterScriptImport(const TQString&))); + connect(m_editInputFilterLocation, TQT_SIGNAL(urlSelected(const TQString&)), m_editInputFilterLocation, TQT_SLOT(setURL(const TQString&))); - connect(m_editInputFilterFileType, SIGNAL(textChanged(const QString&)), &m_profile, SLOT(setFilterFileType(const QString&))); + connect(m_editInputFilterFileType, TQT_SIGNAL(textChanged(const TQString&)), &m_profile, TQT_SLOT(setFilterFileType(const TQString&))); - connect(m_editOutputFilterLocation, SIGNAL(textChanged(const QString&)), &m_profile, SLOT(setFilterScriptExport(const QString&))); - connect(m_editOutputFilterLocation, SIGNAL(urlSelected(const QString&)), m_editOutputFilterLocation, SLOT(setURL(const QString&))); + connect(m_editOutputFilterLocation, TQT_SIGNAL(textChanged(const TQString&)), &m_profile, TQT_SLOT(setFilterScriptExport(const TQString&))); + connect(m_editOutputFilterLocation, TQT_SIGNAL(urlSelected(const TQString&)), m_editOutputFilterLocation, TQT_SLOT(setURL(const TQString&))); - connect(m_attemptMatch, SIGNAL(toggled(bool)), &m_profile, SLOT(setAttemptMatchDuplicates(bool))); + connect(m_attemptMatch, TQT_SIGNAL(toggled(bool)), &m_profile, TQT_SLOT(setAttemptMatchDuplicates(bool))); } MyMoneyQifProfileEditor::~MyMoneyQifProfileEditor() @@ -145,9 +145,9 @@ MyMoneyQifProfileEditor::~MyMoneyQifProfileEditor() void MyMoneyQifProfileEditor::loadWidgets(void) { if(m_inEdit) - setCaption(i18n("QIF Profile Editor")); + setCaption(i18n("TQIF Profile Editor")); else - setCaption(i18n("QIF Profile Selector")); + setCaption(i18n("TQIF Profile Selector")); m_editDateFormat->clear(); m_editDateFormat->insertItem( "%d/%m/%yy" ); @@ -175,12 +175,12 @@ void MyMoneyQifProfileEditor::loadWidgets(void) m_editApostrophe->insertItem( "1900-1999" ); m_editApostrophe->insertItem( "2000-2099" ); - m_editAmounts->setColumnAlignment(1, Qt::AlignCenter); - m_editAmounts->setColumnAlignment(2, Qt::AlignCenter); - m_editAmounts->setColumnAlignment(3, Qt::AlignCenter); + m_editAmounts->setColumnAlignment(1, TQt::AlignCenter); + m_editAmounts->setColumnAlignment(2, TQt::AlignCenter); + m_editAmounts->setColumnAlignment(3, TQt::AlignCenter); m_editAmounts->setColumnWidth(4, 0); - m_editAmounts->setColumnWidthMode(4, QListView::Manual); + m_editAmounts->setColumnWidthMode(4, TQListView::Manual); m_editAmounts->setSorting(4); m_editAmounts->sort(); @@ -216,7 +216,7 @@ void MyMoneyQifProfileEditor::loadWidgets(void) void MyMoneyQifProfileEditor::loadProfileListFromConfig(void) { - QFontMetrics fontMetrics(m_profileListBox->font()); + TQFontMetrics fontMetrics(m_profileListBox->font()); int w = 100; // minimum is 100 pixels width for the list box if(m_profile.isDirty()) { @@ -226,14 +226,14 @@ void MyMoneyQifProfileEditor::loadProfileListFromConfig(void) m_profileListBox->clear(); - QStringList list; + TQStringList list; KConfig* config = KGlobal::config(); config->setGroup("Profiles"); list = config->readListEntry("profiles"); if(list.count() == 0) { m_profile.clear(); - m_profile.setProfileDescription(i18n("The default QIF profile")); + m_profile.setProfileDescription(i18n("The default TQIF profile")); addProfile("Default"); config->setGroup("Profiles"); @@ -249,28 +249,28 @@ void MyMoneyQifProfileEditor::loadProfileListFromConfig(void) } for(unsigned int i = 0; i < list.count(); ++i) { int nw = fontMetrics.width(list[i]) + 10; - w = QMAX( w, nw ); + w = TQMAX( w, nw ); } - w = QMIN(w, 200); + w = TQMIN(w, 200); m_profileListBox->setMinimumWidth(w); } -void MyMoneyQifProfileEditor::slotLoadProfileFromConfig(const QString& profile) +void MyMoneyQifProfileEditor::slotLoadProfileFromConfig(const TQString& profile) { - QString profileName = profile; + TQString profileName = profile; if(m_profile.isDirty()) { m_profile.saveProfile(); m_isDirty = true; } - if(m_profileListBox->findItem(profileName, Qt::ExactMatch | Qt::CaseSensitive) == NULL) { + if(m_profileListBox->tqfindItem(profileName, TQt::ExactMatch | TQt::CaseSensitive) == NULL) { profileName = m_profileListBox->text(0); } m_profile.loadProfile("Profile-" + profileName); - QListBoxItem *lbi = m_profileListBox->findItem(profileName, Qt::ExactMatch | Qt::CaseSensitive); + TQListBoxItem *lbi = m_profileListBox->tqfindItem(profileName, TQt::ExactMatch | TQt::CaseSensitive); int idx = m_profileListBox->index(lbi); showProfile(); if(idx >= 0) { @@ -294,11 +294,11 @@ void MyMoneyQifProfileEditor::showProfile(void) m_attemptMatch->setChecked(m_profile.attemptMatchDuplicates()); - QListViewItem* item; - QListViewItemIterator it(m_editAmounts); + TQListViewItem* item; + TQListViewItemIterator it(m_editAmounts); while((item = it.current()) != 0) { - QChar key = item->text(1)[0]; + TQChar key = item->text(1)[0]; item->setText(2, m_profile.amountDecimal(key)); item->setText(3, m_profile.amountThousands(key)); if(m_selectedAmountType == 0 && key == 'T' && m_inEdit) { @@ -311,25 +311,25 @@ void MyMoneyQifProfileEditor::showProfile(void) } } -void MyMoneyQifProfileEditor::deleteProfile(const QString& name) +void MyMoneyQifProfileEditor::deleteProfile(const TQString& name) { KConfig* config = KGlobal::config(); config->deleteGroup("Profile-" + name); config->setGroup("Profiles"); - QStringList list = config->readListEntry("profiles"); + TQStringList list = config->readListEntry("profiles"); list.remove(name); config->writeEntry("profiles", list); m_isDirty = true; } -void MyMoneyQifProfileEditor::addProfile(const QString& name) +void MyMoneyQifProfileEditor::addProfile(const TQString& name) { KConfig* config = KGlobal::config(); config->setGroup("Profiles"); - QStringList list = config->readListEntry("profiles"); + TQStringList list = config->readListEntry("profiles"); list += name; list.sort(); @@ -364,7 +364,7 @@ void MyMoneyQifProfileEditor::slotReset(void) config->rollback(); config->reparseConfiguration(); - QString currentProfile = m_profile.profileName().mid(8); + TQString currentProfile = m_profile.profileName().mid(8); loadProfileListFromConfig(); slotLoadProfileFromConfig(currentProfile); m_isDirty = false; @@ -373,7 +373,7 @@ void MyMoneyQifProfileEditor::slotReset(void) void MyMoneyQifProfileEditor::slotRename(void) { bool ok; - QString newName = enterName(ok); + TQString newName = enterName(ok); if(ok == true) { deleteProfile(m_profile.profileName().mid(8)); @@ -386,7 +386,7 @@ void MyMoneyQifProfileEditor::slotRename(void) void MyMoneyQifProfileEditor::slotNew(void) { bool ok; - QString newName = enterName(ok); + TQString newName = enterName(ok); if(ok == true) { m_profile.clear(); @@ -396,20 +396,20 @@ void MyMoneyQifProfileEditor::slotNew(void) } } -const QString MyMoneyQifProfileEditor::enterName(bool& ok) +const TQString MyMoneyQifProfileEditor::enterName(bool& ok) { - MyMoneyQifProfileNameValidator val(this, "Validator"); + MyMoneyQifProfileNameValidator val(TQT_TQOBJECT(this), "Validator"); #if KDE_IS_VERSION(3,2,0) - return KInputDialog::getText(i18n("QIF Profile Editor"), + return KInputDialog::getText(i18n("TQIF Profile Editor"), i18n("Enter new profile name"), - QString::null, + TQString(), &ok, this, 0, &val, 0); #else - QString rc; + TQString rc; // the blank in the next line as the value for the edit box is // there on purpose, so that with the following call to validateAndSet @@ -431,9 +431,9 @@ const QString MyMoneyQifProfileEditor::enterName(bool& ok) void MyMoneyQifProfileEditor::slotDelete(void) { - QString profile = m_profile.profileName().mid(8); + TQString profile = m_profile.profileName().mid(8); - if(KMessageBox::questionYesNo(this, i18n("Do you really want to delete profile '%1'?").arg(profile)) == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, i18n("Do you really want to delete profile '%1'?").tqarg(profile)) == KMessageBox::Yes) { int idx = m_profileListBox->currentItem(); m_profile.saveProfile(); deleteProfile(profile); @@ -450,32 +450,32 @@ void MyMoneyQifProfileEditor::slotHelp(void) kapp->invokeHelp("details.impexp.qifimp.profile"); } -void MyMoneyQifProfileEditor::slotAmountTypeSelected(QListViewItem* item) +void MyMoneyQifProfileEditor::slotAmountTypeSelected(TQListViewItem* item) { m_decimalBox->setCurrentText(item->text(2)); m_thousandsBox->setCurrentText(item->text(3)); m_selectedAmountType = item; } -void MyMoneyQifProfileEditor::slotDecimalChanged(const QString& val) +void MyMoneyQifProfileEditor::slotDecimalChanged(const TQString& val) { if(m_selectedAmountType != 0) { - QChar key = m_selectedAmountType->text(1)[0]; + TQChar key = m_selectedAmountType->text(1)[0]; m_profile.setAmountDecimal(key, val[0]); m_selectedAmountType->setText(2, val); } } -void MyMoneyQifProfileEditor::slotThousandsChanged(const QString& val) +void MyMoneyQifProfileEditor::slotThousandsChanged(const TQString& val) { if(m_selectedAmountType != 0) { - QChar key = m_selectedAmountType->text(1)[0]; + TQChar key = m_selectedAmountType->text(1)[0]; m_profile.setAmountThousands(key, val[0]); m_selectedAmountType->setText(3, val); } } -const QString MyMoneyQifProfileEditor::selectedProfile() const +const TQString MyMoneyQifProfileEditor::selectedProfile() const { return m_profileListBox->currentText(); } diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditor.h b/kmymoney2/dialogs/mymoneyqifprofileeditor.h index ce95c9a..67993c2 100644 --- a/kmymoney2/dialogs/mymoneyqifprofileeditor.h +++ b/kmymoney2/dialogs/mymoneyqifprofileeditor.h @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#ifndef MYMONEYQIFPROFILEEDITOR_H -#define MYMONEYQIFPROFILEEDITOR_H +#ifndef MYMONEYTQIFPROFILEEDITOR_H +#define MYMONEYTQIFPROFILEEDITOR_H // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> -#include <qvalidator.h> -class QListViewItem; +#include <tqwidget.h> +#include <tqvalidator.h> +class TQListViewItem; // ---------------------------------------------------------------------------- // KDE Includes @@ -38,59 +38,61 @@ class QListViewItem; * @author Thomas Baumgart */ -class MyMoneyQifProfileNameValidator : public QValidator +class MyMoneyQifProfileNameValidator : public TQValidator { Q_OBJECT + TQ_OBJECT public: - MyMoneyQifProfileNameValidator(QObject *o, const char *name); + MyMoneyQifProfileNameValidator(TQObject *o, const char *name); virtual ~MyMoneyQifProfileNameValidator(); - QValidator::State validate(QString&, int&) const; + TQValidator::State validate(TQString&, int&) const; }; class MyMoneyQifProfileEditor : public MyMoneyQifProfileEditorDecl { Q_OBJECT + TQ_OBJECT public: - MyMoneyQifProfileEditor(const bool edit = false, QWidget *parent=0, const char *name=0); + MyMoneyQifProfileEditor(const bool edit = false, TQWidget *tqparent=0, const char *name=0); virtual ~MyMoneyQifProfileEditor(); /** * This method returns the currently selected profile in the list box. */ - const QString selectedProfile() const; + const TQString selectedProfile() const; public slots: void slotOk(void); protected slots: - void slotLoadProfileFromConfig(const QString& name); + void slotLoadProfileFromConfig(const TQString& name); void slotReset(void); void slotRename(void); void slotDelete(void); void slotNew(void); - void slotAmountTypeSelected(QListViewItem*); - void slotDecimalChanged(const QString& val); - void slotThousandsChanged(const QString& val); + void slotAmountTypeSelected(TQListViewItem*); + void slotDecimalChanged(const TQString& val); + void slotThousandsChanged(const TQString& val); void slotHelp(void); private: void loadProfileListFromConfig(void); void loadWidgets(void); void showProfile(void); - void addProfile(const QString& name); - void deleteProfile(const QString& name); - const QString enterName(bool& ok); + void addProfile(const TQString& name); + void deleteProfile(const TQString& name); + const TQString enterName(bool& ok); private: bool m_inEdit; MyMoneyQifProfile m_profile; bool m_isDirty; bool m_isAccepted; - QListViewItem* m_selectedAmountType; + TQListViewItem* m_selectedAmountType; }; #endif diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui b/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui index 43e56fa..b88f241 100644 --- a/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui +++ b/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MyMoneyQifProfileEditorDecl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>MyMoneyQifProfileEditorDecl</cstring> </property> @@ -28,15 +28,15 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListBox"> + <widget class="TQListBox"> <item> <property name="text"> <string></string> @@ -57,11 +57,11 @@ <bool>true</bool> </property> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>profileTabs</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tabGeneral</cstring> </property> @@ -72,19 +72,19 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel2_2_3</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>140</width> <height>0</height> @@ -94,11 +94,11 @@ <string>Void mark</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>140</width> <height>0</height> @@ -113,11 +113,11 @@ <cstring>m_editOpeningBalance</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>140</width> <height>0</height> @@ -137,11 +137,11 @@ <cstring>m_editVoidMark</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel2_2_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>140</width> <height>0</height> @@ -161,11 +161,11 @@ <cstring>m_editDescription</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>140</width> <height>0</height> @@ -177,7 +177,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_attemptMatch</cstring> </property> @@ -195,7 +195,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -204,7 +204,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tabDate</cstring> </property> @@ -215,17 +215,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout43</cstring> + <cstring>tqlayout43</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout36</cstring> + <cstring>tqlayout36</cstring> </property> <grid> <property name="name"> @@ -239,11 +239,11 @@ <string>The format of the dates in the QIF file.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>140</width> <height>0</height> @@ -264,11 +264,11 @@ <string>If a QIF file contains date entries with years represented with two digits then either an apostrophe or a slash may be used to delimit the year in the dates for certain centuries. This enables 1905 to be distinguished from 2005. Specify here which range of years will have year delimited by an apostrophe (eg. for Quicken this is usually 1900-1949).</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>140</width> <height>0</height> @@ -293,7 +293,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> @@ -312,7 +312,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>80</height> @@ -321,7 +321,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tabMoney</cstring> </property> @@ -332,7 +332,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Field</string> @@ -561,17 +561,17 @@ <enum>Accept</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout41</cstring> + <cstring>tqlayout41</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout40</cstring> + <cstring>tqlayout40</cstring> </property> <grid> <property name="name"> @@ -582,11 +582,11 @@ <cstring>m_thousandsBox</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -596,11 +596,11 @@ <string>Decimal Symbol</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -627,7 +627,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>100</width> <height>20</height> @@ -646,7 +646,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> @@ -655,7 +655,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tabFilter</cstring> </property> @@ -666,19 +666,19 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1_4_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>140</width> <height>0</height> @@ -701,11 +701,11 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_4_3</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>140</width> <height>0</height> @@ -715,7 +715,7 @@ <string>Input filter file type</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_editInputFilterFileType</cstring> </property> @@ -723,11 +723,11 @@ <string>*.qif</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_4</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>140</width> <height>0</height> @@ -749,7 +749,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>90</height> @@ -761,7 +761,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout14</cstring> </property> @@ -823,7 +823,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>104</width> <height>0</height> @@ -901,5 +901,5 @@ <tabstop>m_editInputFilterLocation</tabstop> <tabstop>m_editOutputFilterLocation</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/settings/ksettingscolors.cpp b/kmymoney2/dialogs/settings/ksettingscolors.cpp index 727241c..06a5199 100644 --- a/kmymoney2/dialogs/settings/ksettingscolors.cpp +++ b/kmymoney2/dialogs/settings/ksettingscolors.cpp @@ -25,8 +25,8 @@ #include "ksettingscolors.h" -KSettingsColors::KSettingsColors(QWidget* parent, const char* name) : - KSettingsColorsDecl(parent, name) +KSettingsColors::KSettingsColors(TQWidget* tqparent, const char* name) : + KSettingsColorsDecl(tqparent, name) { } diff --git a/kmymoney2/dialogs/settings/ksettingscolors.h b/kmymoney2/dialogs/settings/ksettingscolors.h index 896ad85..0f877a2 100644 --- a/kmymoney2/dialogs/settings/ksettingscolors.h +++ b/kmymoney2/dialogs/settings/ksettingscolors.h @@ -31,9 +31,10 @@ class KSettingsColors : public KSettingsColorsDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsColors(QWidget* parent = 0, const char* name = 0); + KSettingsColors(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsColors(); }; #endif diff --git a/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui b/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui index 2d4d15b..98fe42b 100644 --- a/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSettingsColorsDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSettingsColorsDecl</cstring> </property> @@ -19,11 +19,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -53,7 +53,7 @@ <string>Grid color</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -61,7 +61,7 @@ <string>Erronous transaction</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -99,7 +99,7 @@ </color> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -166,7 +166,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -177,7 +177,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_useSystemColors</cstring> </property> @@ -185,7 +185,7 @@ <string>Use system colors</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_individualColorFrame</cstring> </property> @@ -196,7 +196,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -204,7 +204,7 @@ <string>Normal</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -252,7 +252,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -263,7 +263,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_5</cstring> </property> @@ -286,7 +286,7 @@ </color> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -317,7 +317,7 @@ </color> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -340,7 +340,7 @@ </color> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -382,7 +382,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -402,5 +402,5 @@ <slot>setDisabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/settings/ksettingsfonts.cpp b/kmymoney2/dialogs/settings/ksettingsfonts.cpp index a4aef71..c21437d 100644 --- a/kmymoney2/dialogs/settings/ksettingsfonts.cpp +++ b/kmymoney2/dialogs/settings/ksettingsfonts.cpp @@ -25,8 +25,8 @@ #include "ksettingsfonts.h" -KSettingsFonts::KSettingsFonts(QWidget* parent, const char* name) : - KSettingsFontsDecl(parent, name) +KSettingsFonts::KSettingsFonts(TQWidget* tqparent, const char* name) : + KSettingsFontsDecl(tqparent, name) { } diff --git a/kmymoney2/dialogs/settings/ksettingsfonts.h b/kmymoney2/dialogs/settings/ksettingsfonts.h index 40cb9de..eda94fd 100644 --- a/kmymoney2/dialogs/settings/ksettingsfonts.h +++ b/kmymoney2/dialogs/settings/ksettingsfonts.h @@ -31,9 +31,10 @@ class KSettingsFonts : public KSettingsFontsDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsFonts(QWidget* parent = 0, const char* name = 0); + KSettingsFonts(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsFonts(); }; #endif diff --git a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui index cbaefeb..6cb100a 100644 --- a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSettingsFontsDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSettingsFontsDecl</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_useSystemFont</cstring> </property> @@ -27,7 +27,7 @@ <string>Use system fonts</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_individualFontsFrame</cstring> </property> @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>20</height> @@ -75,14 +75,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>100</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -90,7 +90,7 @@ <string>Cell font</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -127,5 +127,5 @@ <slot>setDisabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/settings/ksettingsforecast.cpp b/kmymoney2/dialogs/settings/ksettingsforecast.cpp index 0a74252..d3e8770 100644 --- a/kmymoney2/dialogs/settings/ksettingsforecast.cpp +++ b/kmymoney2/dialogs/settings/ksettingsforecast.cpp @@ -25,8 +25,8 @@ #include "ksettingsforecast.h" -KSettingsForecast::KSettingsForecast(QWidget* parent, const char* name) : - KSettingsForecastDecl(parent, name) +KSettingsForecast::KSettingsForecast(TQWidget* tqparent, const char* name) : + KSettingsForecastDecl(tqparent, name) { } diff --git a/kmymoney2/dialogs/settings/ksettingsforecast.h b/kmymoney2/dialogs/settings/ksettingsforecast.h index 7195eee..4423a39 100644 --- a/kmymoney2/dialogs/settings/ksettingsforecast.h +++ b/kmymoney2/dialogs/settings/ksettingsforecast.h @@ -32,9 +32,10 @@ class KSettingsForecast : public KSettingsForecastDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsForecast(QWidget* parent = 0, const char* name = 0); + KSettingsForecast(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsForecast(); }; #endif diff --git a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui index c412f81..c3f90df 100644 --- a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSettingsForecastDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSettingsForecastDecl</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -38,28 +38,28 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>kcfg_forecastAccountCycle</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -67,12 +67,12 @@ <string>Number of Days of Account Cycle:</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>kcfg_forecastDays</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -80,12 +80,12 @@ <string>Day of Month to start Forecast:</string> </property> </widget> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>kcfg_beginForecastDay</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>133</width> <height>21</height> @@ -114,7 +114,7 @@ </spacer> </grid> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>kcfg_forecastMethod</cstring> </property> @@ -125,7 +125,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton9</cstring> </property> @@ -136,7 +136,7 @@ <number>0</number> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton10</cstring> </property> @@ -149,7 +149,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -164,7 +164,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -172,7 +172,7 @@ <string>Number of Cycles to use in Forecast:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_forecastCycles</cstring> </property> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>130</width> <height>21</height> @@ -195,7 +195,7 @@ </property> </spacer> </hbox> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>kcfg_historyMethod</cstring> </property> @@ -206,7 +206,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton11</cstring> </property> @@ -217,7 +217,7 @@ <number>0</number> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton12</cstring> </property> @@ -228,7 +228,7 @@ <number>1</number> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton13</cstring> </property> @@ -255,7 +255,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -264,5 +264,5 @@ </spacer> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/settings/ksettingsgeneral.cpp b/kmymoney2/dialogs/settings/ksettingsgeneral.cpp index 5acdd08..e36530f 100644 --- a/kmymoney2/dialogs/settings/ksettingsgeneral.cpp +++ b/kmymoney2/dialogs/settings/ksettingsgeneral.cpp @@ -17,7 +17,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlabel.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -31,8 +31,8 @@ #include <kmymoney/kmymoneydateinput.h> #include "ksettingsgeneral.h" -KSettingsGeneral::KSettingsGeneral(QWidget* parent, const char* name) : - KSettingsGeneralDecl(parent, name) +KSettingsGeneral::KSettingsGeneral(TQWidget* tqparent, const char* name) : + KSettingsGeneralDecl(tqparent, name) { // hide the internally used date field kcfg_StartDate->hide(); @@ -43,20 +43,20 @@ KSettingsGeneral::KSettingsGeneral(QWidget* parent, const char* name) : m_viewList->hide(); // setup connections, so that the sort optios get loaded once the edit fields are filled - connect(kcfg_StartDate, SIGNAL(valueChanged(const QDate&)), this, SLOT(slotLoadStartDate(const QDate&))); + connect(kcfg_StartDate, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotLoadStartDate(const TQDate&))); // setup connections, so that changes by the user are forwarded to the (hidden) edit fields - connect(m_startDateEdit, SIGNAL(dateChanged(const QDate&)), kcfg_StartDate, SLOT(setDate(const QDate&))); + connect(m_startDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), kcfg_StartDate, TQT_SLOT(setDate(const TQDate&))); } KSettingsGeneral::~KSettingsGeneral() { } -void KSettingsGeneral::slotLoadStartDate(const QDate&) +void KSettingsGeneral::slotLoadStartDate(const TQDate&) { // only need this once - disconnect(kcfg_StartDate, SIGNAL(valueChanged(const QDate&)), this, SLOT(slotLoadStartDate(const QDate&))); + disconnect(kcfg_StartDate, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotLoadStartDate(const TQDate&))); m_startDateEdit->setDate(kcfg_StartDate->date()); } diff --git a/kmymoney2/dialogs/settings/ksettingsgeneral.h b/kmymoney2/dialogs/settings/ksettingsgeneral.h index 3bd0992..246a600 100644 --- a/kmymoney2/dialogs/settings/ksettingsgeneral.h +++ b/kmymoney2/dialogs/settings/ksettingsgeneral.h @@ -31,13 +31,14 @@ class KSettingsGeneral : public KSettingsGeneralDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsGeneral(QWidget* parent = 0, const char* name = 0); + KSettingsGeneral(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsGeneral(); protected slots: - void slotLoadStartDate(const QDate&); + void slotLoadStartDate(const TQDate&); }; #endif diff --git a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui index 9eeb181..b851f2b 100644 --- a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSettingsGeneralDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSettingsGeneralDecl</cstring> </property> @@ -19,11 +19,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>kcfg_StartLastViewSelected</cstring> </property> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1</cstring> </property> @@ -62,7 +62,7 @@ <number>0</number> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton2</cstring> </property> @@ -75,7 +75,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -86,7 +86,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -94,7 +94,7 @@ <string>Price precision</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_PricePrecision</cstring> </property> @@ -102,7 +102,7 @@ <number>10</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> @@ -129,7 +129,7 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -140,7 +140,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AutoSaveFile</cstring> </property> @@ -148,7 +148,7 @@ <string>Autosave periodically</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_periodFrame</cstring> </property> @@ -168,7 +168,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_AutoSavePeriod</cstring> </property> @@ -176,7 +176,7 @@ <number>60</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>354</width> <height>20</height> @@ -205,7 +205,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -216,7 +216,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -304,7 +304,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -332,7 +332,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -343,7 +343,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_syncLedgerInvestment</cstring> </property> @@ -359,14 +359,14 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_viewLabel</cstring> </property> <property name="text"> <string>Check the views you want to enable, uncheck those you want to hide, because you don't need the functionality.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -383,7 +383,7 @@ </sizepolicy> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>kcfg_iconSize</cstring> </property> @@ -397,7 +397,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioButton3</cstring> </property> @@ -405,7 +405,7 @@ <string>Micro (16px)</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioButton4</cstring> </property> @@ -413,7 +413,7 @@ <string>Small (32px)</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>radioButton5</cstring> </property> @@ -424,7 +424,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="1"> + <widget class="TQRadioButton" row="1" column="1"> <property name="name"> <cstring>radioButton6</cstring> </property> @@ -434,7 +434,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_showTitleBar</cstring> </property> @@ -452,7 +452,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -461,7 +461,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -472,7 +472,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -483,7 +483,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_HideUnusedCategory</cstring> </property> @@ -494,7 +494,7 @@ <string>This option hides all categories in the categories view that are not used in at least a single transaction. They are still shown in the category selection lists.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_HideClosedAccounts</cstring> </property> @@ -507,7 +507,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden accounts in the views.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ExpertMode</cstring> </property> @@ -517,7 +517,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -528,7 +528,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_HideFinishedSchedules</cstring> </property> @@ -541,7 +541,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -552,15 +552,15 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -573,7 +573,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden <cstring>m_startDateEdit</cstring> </property> </widget> - <widget class="QDateEdit"> + <widget class="TQDateEdit"> <property name="name"> <cstring>kcfg_StartDate</cstring> </property> @@ -588,7 +588,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>63</width> <height>20</height> @@ -597,7 +597,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden </spacer> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_HideReconciledTransactions</cstring> </property> @@ -620,7 +620,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -642,5 +642,8 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/settings/ksettingsgpg.cpp b/kmymoney2/dialogs/settings/ksettingsgpg.cpp index 2dba83e..133700d 100644 --- a/kmymoney2/dialogs/settings/ksettingsgpg.cpp +++ b/kmymoney2/dialogs/settings/ksettingsgpg.cpp @@ -17,9 +17,9 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qregexp.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqregexp.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -40,8 +40,8 @@ #define RECOVER_KEY_ID "0xD2B08440" #define RECOVER_KEY_ID_FULL "59B0F826D2B08440" -KSettingsGpg::KSettingsGpg(QWidget* parent, const char* name) : - KSettingsGpgDecl(parent, name), +KSettingsGpg::KSettingsGpg(TQWidget* tqparent, const char* name) : + KSettingsGpgDecl(tqparent, name), m_checkCount(0), m_needCheckList(true), m_listOk(false) @@ -51,11 +51,11 @@ KSettingsGpg::KSettingsGpg(QWidget* parent, const char* name) : // don't show the widget in which the master key is actually kept kcfg_GpgRecipient->hide(); - connect(kcfg_WriteDataEncrypted, SIGNAL(toggled(bool)), this, SLOT(slotStatusChanged(bool))); - connect(m_masterKeyCombo, SIGNAL(activated(int)), this, SLOT(slotIdChanged())); - connect(kcfg_GpgRecipientList, SIGNAL(changed()), this, SLOT(slotIdChanged())); - connect(kcfg_GpgRecipientList, SIGNAL(added(const QString&)), this, SLOT(slotKeyListChanged())); - connect(kcfg_GpgRecipientList, SIGNAL(removed(const QString&)), this, SLOT(slotKeyListChanged())); + connect(kcfg_WriteDataEncrypted, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotStatusChanged(bool))); + connect(m_masterKeyCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotIdChanged())); + connect(kcfg_GpgRecipientList, TQT_SIGNAL(changed()), this, TQT_SLOT(slotIdChanged())); + connect(kcfg_GpgRecipientList, TQT_SIGNAL(added(const TQString&)), this, TQT_SLOT(slotKeyListChanged())); + connect(kcfg_GpgRecipientList, TQT_SIGNAL(removed(const TQString&)), this, TQT_SLOT(slotKeyListChanged())); // Initial state setup slotStatusChanged(kcfg_WriteDataEncrypted->isChecked()); @@ -93,8 +93,8 @@ void KSettingsGpg::slotIdChanged(void) // if it is available, then scan the current list if we need to if(keysOk) { if(m_needCheckList) { - QStringList keys = kcfg_GpgRecipientList->items(); - QStringList::const_iterator it_s; + TQStringList keys = kcfg_GpgRecipientList->items(); + TQStringList::const_iterator it_s; for(it_s = keys.begin(); keysOk && it_s != keys.end(); ++it_s) { if(!KGPGFile::keyAvailable(*it_s)) keysOk = false; @@ -115,7 +115,7 @@ void KSettingsGpg::slotIdChanged(void) // if we have a master key, we store it in the hidden widget if(m_masterKeyCombo->currentItem() != 0) { - QRegExp keyExp(".* \\((.*)\\)"); + TQRegExp keyExp(".* \\((.*)\\)"); if(keyExp.search(m_masterKeyCombo->currentText()) != -1) { kcfg_GpgRecipient->setText(keyExp.cap(1)); } @@ -131,10 +131,10 @@ void KSettingsGpg::slotIdChanged(void) void KSettingsGpg::show(void) { - QString masterKey; + TQString masterKey; if(m_masterKeyCombo->currentItem() != 0) { - QRegExp keyExp(".* \\((.*)\\)"); + TQRegExp keyExp(".* \\((.*)\\)"); if(keyExp.search(m_masterKeyCombo->currentText()) != -1) { masterKey = keyExp.cap(1); } @@ -143,19 +143,19 @@ void KSettingsGpg::show(void) // fill the secret key combobox with a fresh list m_masterKeyCombo->clear(); - QStringList keyList; + TQStringList keyList; KGPGFile::secretKeyList(keyList); - for(QStringList::iterator it = keyList.begin(); it != keyList.end(); ++it) { - QStringList fields = QStringList::split(":", *it); + for(TQStringList::iterator it = keyList.begin(); it != keyList.end(); ++it) { + TQStringList fields = TQStringList::split(":", *it); if(fields[0] != RECOVER_KEY_ID_FULL) { - // replace parenthesis in name field with brackets - QString name = fields[1]; - name.replace('(', "["); - name.replace(')', "]"); - name = QString("%1 (0x%2)").arg(name).arg(fields[0]); + // replace tqparenthesis in name field with brackets + TQString name = fields[1]; + name.tqreplace('(', "["); + name.tqreplace(')', "]"); + name = TQString("%1 (0x%2)").tqarg(name).tqarg(fields[0]); m_masterKeyCombo->insertItem(name); - if(name.contains(masterKey)) + if(name.tqcontains(masterKey)) m_masterKeyCombo->setCurrentItem(name); } } @@ -177,7 +177,7 @@ void KSettingsGpg::slotStatusChanged(bool state) state = false; if((state == true) && (oncePerSession == true) && isVisible()) { - KMessageBox::information(this, QString("<qt>%1</qt>").arg(i18n("You have turned on the GPG encryption support. This means, that new files will be stored encrypted. Existing files will not be encrypted automatically. To achieve encryption of existing files, please use the <b>File/Save as...</b> feature and store the file under a different name. Once confident with the result, feel free to delete the old file and rename the encrypted one to the old name.")), i18n("GPG encryption activated"), "GpgEncryptionActivated"); + KMessageBox::information(this, TQString("<qt>%1</qt>").tqarg(i18n("You have turned on the GPG encryption support. This means, that new files will be stored encrypted. Existing files will not be encrypted automatically. To achieve encryption of existing files, please use the <b>File/Save as...</b> feature and store the file under a different name. Once confident with the result, feel free to delete the old file and rename the encrypted one to the old name.")), i18n("GPG encryption activated"), "GpgEncryptionActivated"); oncePerSession = false; } diff --git a/kmymoney2/dialogs/settings/ksettingsgpg.h b/kmymoney2/dialogs/settings/ksettingsgpg.h index ecea6ab..2508192 100644 --- a/kmymoney2/dialogs/settings/ksettingsgpg.h +++ b/kmymoney2/dialogs/settings/ksettingsgpg.h @@ -32,9 +32,10 @@ class KSettingsGpg : public KSettingsGpgDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsGpg(QWidget* parent = 0, const char* name = 0); + KSettingsGpg(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsGpg(); public slots: diff --git a/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui b/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui index 15d3bbe..0d82e45 100644 --- a/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSettingsGpgDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSettingsGpgDecl</cstring> </property> @@ -24,7 +24,7 @@ The <i>additional recovery encryption</i> is only accessible, if the <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_WriteDataEncrypted</cstring> </property> @@ -32,7 +32,7 @@ The <i>additional recovery encryption</i> is only accessible, if the <string>Use GPG encryption</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_idGroup</cstring> </property> @@ -46,15 +46,15 @@ The <i>additional recovery encryption</i> is only accessible, if the <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -102,9 +102,9 @@ The <i>additional recovery encryption</i> is only accessible, if the <string>Enter the id of the key you want to use for data encryption. This can either be an e-mail address or the hexadecimal key id. In case of the key id don't forget the leading 0x.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -124,7 +124,7 @@ The <i>additional recovery encryption</i> is only accessible, if the <string>This symbol denotes, if the key for the given user id has been found in your keyring. It is green when found, dark otherwise.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -142,7 +142,7 @@ The <i>additional recovery encryption</i> is only accessible, if the <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> @@ -151,9 +151,9 @@ The <i>additional recovery encryption</i> is only accessible, if the </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -173,7 +173,7 @@ The <i>additional recovery encryption</i> is only accessible, if the <string>This symbol denotes, if the KMyMoney recovery key has been found in your keyring. It is green when found, dark otherwise.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -191,7 +191,7 @@ The <i>additional recovery encryption</i> is only accessible, if the <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -200,7 +200,7 @@ The <i>additional recovery encryption</i> is only accessible, if the </spacer> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_EncryptRecover</cstring> </property> @@ -225,7 +225,7 @@ This mechanism is provided for the case that you have lost your key and cannot a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>30</height> @@ -234,5 +234,5 @@ This mechanism is provided for the case that you have lost your key and cannot a </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/settings/ksettingshome.cpp b/kmymoney2/dialogs/settings/ksettingshome.cpp index d2f471b..a874de7 100644 --- a/kmymoney2/dialogs/settings/ksettingshome.cpp +++ b/kmymoney2/dialogs/settings/ksettingshome.cpp @@ -17,8 +17,8 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qstringlist.h> -#include <qheader.h> +#include <tqstringlist.h> +#include <tqheader.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -38,8 +38,8 @@ #include "kmymoney2/kmymoneyglobalsettings.h" #include "kmymoney2/kmymoneyutils.h" -KSettingsHome::KSettingsHome(QWidget* parent, const char* name) : - KSettingsHomeDecl(parent, name), +KSettingsHome::KSettingsHome(TQWidget* tqparent, const char* name) : + KSettingsHomeDecl(tqparent, name), m_noNeedToUpdateList(false) { m_homePageList->addColumn(""); @@ -49,11 +49,11 @@ KSettingsHome::KSettingsHome(QWidget* parent, const char* name) : KIconLoader* il = KGlobal::iconLoader(); KGuiItem upButtonItem( i18n( "&Up" ), - QIconSet(il->loadIcon("up", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("up", KIcon::Small, KIcon::SizeSmall)), i18n("Move selected item up"), i18n("Use this to move the selected item up by one position in the list.")); KGuiItem downButtonItem( i18n( "&Down" ), - QIconSet(il->loadIcon("down", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("down", KIcon::Small, KIcon::SizeSmall)), i18n("Move selected item down"), i18n("Use this to move the selected item down by one position in the list.")); @@ -63,14 +63,14 @@ KSettingsHome::KSettingsHome(QWidget* parent, const char* name) : m_downButton->setEnabled(false); // connect this, so that the list gets loaded once the edit field is filled - connect(kcfg_ItemList, SIGNAL(textChanged()), this, SLOT(slotLoadItems())); + connect(kcfg_ItemList, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadItems())); - connect(m_homePageList, SIGNAL(selectionChanged(QListViewItem*)), - this, SLOT(slotSelectHomePageItem(QListViewItem *))); - connect(m_homePageList, SIGNAL(pressed(QListViewItem*)), this, SLOT(slotUpdateItemList())); + connect(m_homePageList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQT_SLOT(slotSelectHomePageItem(TQListViewItem *))); + connect(m_homePageList, TQT_SIGNAL(pressed(TQListViewItem*)), this, TQT_SLOT(slotUpdateItemList())); - connect(m_upButton, SIGNAL(clicked()), this, SLOT(slotMoveUp())); - connect(m_downButton, SIGNAL(clicked()), this, SLOT(slotMoveDown())); + connect(m_upButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveUp())); + connect(m_downButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDown())); // Don't show it to the user, we only need it to load and save the settings kcfg_ItemList->hide(); @@ -85,14 +85,14 @@ void KSettingsHome::slotLoadItems(void) if(m_noNeedToUpdateList) return; - QStringList list = KMyMoneyGlobalSettings::itemList(); - QStringList::ConstIterator it; + TQStringList list = KMyMoneyGlobalSettings::itemList(); + TQStringList::ConstIterator it; int w = 0; m_homePageList->clear(); - QCheckListItem *sel = 0; + TQCheckListItem *sel = 0; - QFontMetrics fm( KGlobalSettings::generalFont()); - QCheckListItem* last = 0; + TQFontMetrics fm( KGlobalSettings::generalFont()); + TQCheckListItem* last = 0; for(it = list.begin(); it != list.end(); ++it) { int idx = (*it).toInt(); @@ -101,7 +101,7 @@ void KSettingsHome::slotLoadItems(void) continue; bool enabled = idx > 0; if(!enabled) idx = -idx; - QCheckListItem* item = new QCheckListItem(m_homePageList, KMyMoneyUtils::homePageItemToString(idx), QCheckListItem::CheckBox); + TQCheckListItem* item = new TQCheckListItem(m_homePageList, KMyMoneyUtils::homePageItemToString(idx), TQCheckListItem::CheckBox); if(last) item->moveItem(last); @@ -123,14 +123,14 @@ void KSettingsHome::slotLoadItems(void) void KSettingsHome::slotUpdateItemList(void) { - QString list; - QListViewItem *it; + TQString list; + TQListViewItem *it; for(it = m_homePageList->firstChild(); it; ) { int item = KMyMoneyUtils::stringToHomePageItem(it->text(0)); - if(!(static_cast<QCheckListItem*>(it)->isOn())) + if(!(static_cast<TQCheckListItem*>(it)->isOn())) item = -item; - list += QString::number(item); + list += TQString::number(item); it = it->nextSibling(); if(it) list += ","; @@ -142,7 +142,7 @@ void KSettingsHome::slotUpdateItemList(void) m_noNeedToUpdateList = false; } -void KSettingsHome::slotSelectHomePageItem(QListViewItem *item) +void KSettingsHome::slotSelectHomePageItem(TQListViewItem *item) { m_upButton->setEnabled(m_homePageList->firstChild() != item); m_downButton->setEnabled(item->nextSibling()); @@ -150,8 +150,8 @@ void KSettingsHome::slotSelectHomePageItem(QListViewItem *item) void KSettingsHome::slotMoveUp(void) { - QListViewItem *item = m_homePageList->currentItem(); - QListViewItem *prev = item->itemAbove(); + TQListViewItem *item = m_homePageList->currentItem(); + TQListViewItem *prev = item->itemAbove(); if(prev) { prev->moveItem(item); slotSelectHomePageItem(item); @@ -161,8 +161,8 @@ void KSettingsHome::slotMoveUp(void) void KSettingsHome::slotMoveDown(void) { - QListViewItem *item = m_homePageList->currentItem(); - QListViewItem *next = item->nextSibling(); + TQListViewItem *item = m_homePageList->currentItem(); + TQListViewItem *next = item->nextSibling(); if(next) { item->moveItem(next); slotSelectHomePageItem(item); diff --git a/kmymoney2/dialogs/settings/ksettingshome.h b/kmymoney2/dialogs/settings/ksettingshome.h index c461210..9717b2d 100644 --- a/kmymoney2/dialogs/settings/ksettingshome.h +++ b/kmymoney2/dialogs/settings/ksettingshome.h @@ -20,7 +20,7 @@ // ---------------------------------------------------------------------------- // QT Includes -class QListViewItem; +class TQListViewItem; // ---------------------------------------------------------------------------- // KDE Includes @@ -33,15 +33,16 @@ class QListViewItem; class KSettingsHome : public KSettingsHomeDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsHome(QWidget* parent = 0, const char* name = 0); + KSettingsHome(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsHome(); protected slots: void slotLoadItems(void); void slotUpdateItemList(void); - void slotSelectHomePageItem(QListViewItem *); + void slotSelectHomePageItem(TQListViewItem *); void slotMoveUp(void); void slotMoveDown(void); diff --git a/kmymoney2/dialogs/settings/ksettingshomedecl.ui b/kmymoney2/dialogs/settings/ksettingshomedecl.ui index 49f6251..c248697 100644 --- a/kmymoney2/dialogs/settings/ksettingshomedecl.ui +++ b/kmymoney2/dialogs/settings/ksettingshomedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSettingsHomeDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSettingsHomeDecl</cstring> </property> @@ -19,17 +19,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>70</height> @@ -97,14 +97,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="2" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -118,9 +118,9 @@ </property> <property name="text"> <string>Selected entries are shown on the home page of the application.<p> -Use the buttons and checkboxes to customize the layout of the home page.</string> +Use the buttons and checkboxes to customize the tqlayout of the home page.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -142,7 +142,7 @@ Use the buttons and checkboxes to customize the layout of the home page.</string </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupbox</cstring> </property> @@ -153,7 +153,7 @@ Use the buttons and checkboxes to customize the layout of the home page.</string <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>percentageLabel</cstring> </property> @@ -161,7 +161,7 @@ Use the buttons and checkboxes to customize the layout of the home page.</string <string>Percentage of default font size:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_RememberFontSize</cstring> </property> @@ -193,7 +193,7 @@ Use the buttons and checkboxes to customize the layout of the home page.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -202,7 +202,7 @@ Use the buttons and checkboxes to customize the layout of the home page.</string </spacer> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupbox2</cstring> </property> @@ -213,7 +213,7 @@ Use the buttons and checkboxes to customize the layout of the home page.</string <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_ShowLimitInfo</cstring> </property> @@ -227,5 +227,5 @@ Use the buttons and checkboxes to customize the layout of the home page.</string </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp index db4dc1e..a17fd6e 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp @@ -18,8 +18,8 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qregexp.h> -#include <qcheckbox.h> +#include <tqregexp.h> +#include <tqcheckbox.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -39,10 +39,10 @@ #include "ksettingsonlinequotes.h" #include "kmymoney2/converter/webpricequote.h" -KSettingsOnlineQuotes::KSettingsOnlineQuotes(QWidget *parent, const char *name ) - : KSettingsOnlineQuotesDecl(parent, name) +KSettingsOnlineQuotes::KSettingsOnlineQuotes(TQWidget *tqparent, const char *name ) + : KSettingsOnlineQuotesDecl(tqparent, name) { - QStringList groups = WebPriceQuote::quoteSources(); + TQStringList groups = WebPriceQuote::quoteSources(); loadList(true /*updateResetList*/); @@ -50,36 +50,36 @@ KSettingsOnlineQuotes::KSettingsOnlineQuotes(QWidget *parent, const char *name ) KIconLoader* il = KGlobal::iconLoader(); KGuiItem updateButtenItem( i18n("&Update" ), - QIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)), i18n("Accepts the entered data and stores it"), i18n("Use this to accept the modified data.")); m_updateButton->setGuiItem(updateButtenItem); KGuiItem deleteButtenItem( i18n( "&Delete" ), - QIconSet(il->loadIcon("editdelete", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("editdelete", KIcon::Small, KIcon::SizeSmall)), i18n("Delete the selected source entry"), i18n("Use this to delete the selected online source entry")); m_deleteButton->setGuiItem(deleteButtenItem); KGuiItem newButtenItem( i18n( "&New..." ), - QIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), i18n("Create a new source entry for online quotes"), i18n("Use this to create a new entry for online quotes")); m_newButton->setGuiItem(newButtenItem); - connect(m_updateButton, SIGNAL(clicked()), this, SLOT(slotUpdateEntry())); - connect(m_newButton, SIGNAL(clicked()), this, SLOT(slotNewEntry())); + connect(m_updateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpdateEntry())); + connect(m_newButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewEntry())); - connect(m_quoteSourceList, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotLoadWidgets(QListViewItem*))); - connect(m_quoteSourceList, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotLoadWidgets(QListViewItem*))); - connect(m_quoteSourceList, SIGNAL(itemRenamed(QListViewItem*,const QString&,int)), this, SLOT(slotEntryRenamed(QListViewItem*,const QString&,int))); + connect(m_quoteSourceList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotLoadWidgets(TQListViewItem*))); + connect(m_quoteSourceList, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotLoadWidgets(TQListViewItem*))); + connect(m_quoteSourceList, TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)), this, TQT_SLOT(slotEntryRenamed(TQListViewItem*,const TQString&,int))); - connect(m_editURL, SIGNAL(textChanged(const QString&)), this, SLOT(slotEntryChanged())); - connect(m_editSymbol, SIGNAL(textChanged(const QString&)), this, SLOT(slotEntryChanged())); - connect(m_editDate, SIGNAL(textChanged(const QString&)), this, SLOT(slotEntryChanged())); - connect(m_editDateFormat, SIGNAL(textChanged(const QString&)), this, SLOT(slotEntryChanged())); - connect(m_editPrice, SIGNAL(textChanged(const QString&)), this, SLOT(slotEntryChanged())); - connect(m_skipStripping, SIGNAL(toggled(bool)), this, SLOT(slotEntryChanged())); + connect(m_editURL, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotEntryChanged())); + connect(m_editSymbol, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotEntryChanged())); + connect(m_editDate, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotEntryChanged())); + connect(m_editDateFormat, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotEntryChanged())); + connect(m_editPrice, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotEntryChanged())); + connect(m_skipStripping, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEntryChanged())); // FIXME deleting a source is not yet implemented m_deleteButton->setEnabled(false); @@ -87,30 +87,30 @@ KSettingsOnlineQuotes::KSettingsOnlineQuotes(QWidget *parent, const char *name ) void KSettingsOnlineQuotes::loadList(const bool updateResetList) { - QStringList groups = WebPriceQuote::quoteSources(); + TQStringList groups = WebPriceQuote::quoteSources(); if(updateResetList) m_resetList.clear(); m_quoteSourceList->clear(); - QStringList::Iterator it; + TQStringList::Iterator it; for(it = groups.begin(); it != groups.end(); ++it) { - new QListViewItem(m_quoteSourceList, *it); + new TQListViewItem(m_quoteSourceList, *it); if(updateResetList) m_resetList += WebPriceQuoteSource(*it); } - QListViewItem* first = m_quoteSourceList->firstChild(); + TQListViewItem* first = m_quoteSourceList->firstChild(); if(first) m_quoteSourceList->setSelected(first, true); slotLoadWidgets(first); - m_newButton->setEnabled(m_quoteSourceList->findItem(i18n("New Quote Source"), 0) == 0); + m_newButton->setEnabled(m_quoteSourceList->tqfindItem(i18n("New Quote Source"), 0) == 0); } void KSettingsOnlineQuotes::resetConfig(void) { - QStringList::ConstIterator it; - QStringList groups = WebPriceQuote::quoteSources(); + TQStringList::ConstIterator it; + TQStringList groups = WebPriceQuote::quoteSources(); // delete all currently defined entries for(it = groups.begin(); it != groups.end(); ++it) { @@ -118,7 +118,7 @@ void KSettingsOnlineQuotes::resetConfig(void) } // and write back the one's from the reset list - QValueList<WebPriceQuoteSource>::ConstIterator itr; + TQValueList<WebPriceQuoteSource>::ConstIterator itr; for(itr = m_resetList.begin(); itr != m_resetList.end(); ++itr) { (*itr).write(); } @@ -126,7 +126,7 @@ void KSettingsOnlineQuotes::resetConfig(void) loadList(); } -void KSettingsOnlineQuotes::slotLoadWidgets(QListViewItem* item) +void KSettingsOnlineQuotes::slotLoadWidgets(TQListViewItem* item) { m_editURL->setEnabled(true); m_editSymbol->setEnabled(true); @@ -134,11 +134,11 @@ void KSettingsOnlineQuotes::slotLoadWidgets(QListViewItem* item) m_editDate->setEnabled(true); m_editDateFormat->setEnabled(true); m_skipStripping->setEnabled(true); - m_editURL->setText(QString()); - m_editSymbol->setText(QString()); - m_editPrice->setText(QString()); - m_editDate->setText(QString()); - m_editDateFormat->setText(QString()); + m_editURL->setText(TQString()); + m_editSymbol->setText(TQString()); + m_editPrice->setText(TQString()); + m_editDate->setText(TQString()); + m_editDateFormat->setText(TQString()); if(item) { m_currentItem = WebPriceQuoteSource(item->text(0)); @@ -190,17 +190,17 @@ void KSettingsOnlineQuotes::slotNewEntry(void) WebPriceQuoteSource newSource(i18n("New Quote Source")); newSource.write(); loadList(); - QListViewItem* item = m_quoteSourceList->findItem(i18n("New Quote Source"), 0); + TQListViewItem* item = m_quoteSourceList->tqfindItem(i18n("New Quote Source"), 0); if(item) { m_quoteSourceList->setSelected(item, true); slotLoadWidgets(item); } } -void KSettingsOnlineQuotes::slotEntryRenamed(QListViewItem* item, const QString& text, int /* col */) +void KSettingsOnlineQuotes::slotEntryRenamed(TQListViewItem* item, const TQString& text, int /* col */) { int nameCount = 0; - QListViewItemIterator it(m_quoteSourceList); + TQListViewItemIterator it(m_quoteSourceList); while(it.current()) { if(it.current()->text(0) == text) ++nameCount; @@ -213,7 +213,7 @@ void KSettingsOnlineQuotes::slotEntryRenamed(QListViewItem* item, const QString& } else { item->setText(0, m_currentItem.m_name); } - m_newButton->setEnabled(m_quoteSourceList->findItem(i18n("New Quote Source"), 0) == 0); + m_newButton->setEnabled(m_quoteSourceList->tqfindItem(i18n("New Quote Source"), 0) == 0); } #include "ksettingsonlinequotes.moc" diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotes.h b/kmymoney2/dialogs/settings/ksettingsonlinequotes.h index 8c0b6f0..ef9abe2 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotes.h +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotes.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KSETTINGSONLINEQUOTES_H -#define KSETTINGSONLINEQUOTES_H +#ifndef KSETTINGSONLINETQUOTES_H +#define KSETTINGSONLINETQUOTES_H // ---------------------------------------------------------------------------- // QT Includes @@ -33,8 +33,9 @@ class KSettingsOnlineQuotes : public KSettingsOnlineQuotesDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsOnlineQuotes(QWidget* parent = 0, const char *name = 0); + KSettingsOnlineQuotes(TQWidget* tqparent = 0, const char *name = 0); virtual ~KSettingsOnlineQuotes() {} void writeConfig(void) {} @@ -43,16 +44,16 @@ public: protected slots: void slotUpdateEntry(void); - void slotLoadWidgets(QListViewItem* item); + void slotLoadWidgets(TQListViewItem* item); void slotEntryChanged(void); void slotNewEntry(void); - void slotEntryRenamed(QListViewItem* item, const QString& text, int col); + void slotEntryRenamed(TQListViewItem* item, const TQString& text, int col); protected: void loadList(const bool updateResetList = false); private: - QValueList<WebPriceQuoteSource> m_resetList; + TQValueList<WebPriceQuoteSource> m_resetList; WebPriceQuoteSource m_currentItem; }; diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui index 3077b78..88678ec 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSettingsOnlineQuotesDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSettingsOnlineQuotesDecl</cstring> </property> @@ -12,7 +12,7 @@ <height>442</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -58,7 +58,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupParsing</cstring> </property> @@ -72,7 +72,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -80,7 +80,7 @@ <string>Date</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -115,7 +115,7 @@ <string>Enter the URL from which stock quotes will be fetched. <b>%1</b> will be replaced with the symbol for the security being quoted. For currency conversions, <b>%2</b> will be replaced with the currency to be quoted and <b>%1</b> with the currency the quote is based on.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -131,7 +131,7 @@ <string>Regular Expression to extract the date from the downloaded data</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -139,7 +139,7 @@ <string>Date Format</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -155,7 +155,7 @@ <string>Regular Expression to extract the date from the downloaded data</string> </property> </widget> - <widget class="QCheckBox" row="4" column="2"> + <widget class="TQCheckBox" row="4" column="2"> <property name="name"> <cstring>m_skipStripping</cstring> </property> @@ -177,9 +177,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> @@ -211,7 +211,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>240</width> <height>20</height> @@ -230,5 +230,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/settings/ksettingsplugins.cpp b/kmymoney2/dialogs/settings/ksettingsplugins.cpp index 0887315..b44e124 100644 --- a/kmymoney2/dialogs/settings/ksettingsplugins.cpp +++ b/kmymoney2/dialogs/settings/ksettingsplugins.cpp @@ -18,9 +18,9 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlayout.h> -#include <qstring.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqstring.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -35,13 +35,13 @@ #include "kmymoney2/plugins/pluginloader.h" #include "ksettingsplugins.h" -KSettingsPlugins::KSettingsPlugins(QWidget* parent) - : QWidget(parent) +KSettingsPlugins::KSettingsPlugins(TQWidget* tqparent) + : TQWidget(tqparent) { - QVBoxLayout *layout = new QVBoxLayout(this); - KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()->reparent(this, QPoint()); - layout->addWidget(KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()); - layout->setSpacing(KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()->reparent(this, TQPoint()); + tqlayout->addWidget(KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()); + tqlayout->setSpacing(KDialog::spacingHint()); } KSettingsPlugins::~KSettingsPlugins() diff --git a/kmymoney2/dialogs/settings/ksettingsplugins.h b/kmymoney2/dialogs/settings/ksettingsplugins.h index 9c36f67..0106afb 100644 --- a/kmymoney2/dialogs/settings/ksettingsplugins.h +++ b/kmymoney2/dialogs/settings/ksettingsplugins.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qwidget.h> +#include <tqwidget.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -29,13 +29,14 @@ // ---------------------------------------------------------------------------- // Project Includes -class KSettingsPlugins : public QWidget +class KSettingsPlugins : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KSettingsPlugins(QWidget* parent = 0); + KSettingsPlugins(TQWidget* tqparent = 0); ~KSettingsPlugins(); public slots: diff --git a/kmymoney2/dialogs/settings/ksettingsregister.cpp b/kmymoney2/dialogs/settings/ksettingsregister.cpp index 9f1fda2..e6a278e 100644 --- a/kmymoney2/dialogs/settings/ksettingsregister.cpp +++ b/kmymoney2/dialogs/settings/ksettingsregister.cpp @@ -28,8 +28,8 @@ #include "ksettingsregister.h" #include <kmymoney/transactionsortoption.h> -KSettingsRegister::KSettingsRegister(QWidget* parent, const char* name) : - KSettingsRegisterDecl(parent, name) +KSettingsRegister::KSettingsRegister(TQWidget* tqparent, const char* name) : + KSettingsRegisterDecl(tqparent, name) { // hide the internally used text fields kcfg_sortNormalView->hide(); @@ -37,14 +37,14 @@ KSettingsRegister::KSettingsRegister(QWidget* parent, const char* name) : kcfg_sortSearchView->hide(); // setup connections, so that the sort optios get loaded once the edit fields are filled - connect(kcfg_sortNormalView, SIGNAL(textChanged()), this, SLOT(slotLoadNormal())); - connect(kcfg_sortReconcileView, SIGNAL(textChanged()), this, SLOT(slotLoadReconcile())); - connect(kcfg_sortSearchView, SIGNAL(textChanged()), this, SLOT(slotLoadSearch())); + connect(kcfg_sortNormalView, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadNormal())); + connect(kcfg_sortReconcileView, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadReconcile())); + connect(kcfg_sortSearchView, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadSearch())); // setup connections, so that changes by the user are forwarded to the (hidden) edit fields - connect(m_sortNormalView, SIGNAL(settingsChanged(const QString&)), kcfg_sortNormalView, SLOT(setText(const QString&))); - connect(m_sortReconcileView, SIGNAL(settingsChanged(const QString&)), kcfg_sortReconcileView, SLOT(setText(const QString&))); - connect(m_sortSearchView, SIGNAL(settingsChanged(const QString&)), kcfg_sortSearchView, SLOT(setText(const QString&))); + connect(m_sortNormalView, TQT_SIGNAL(settingsChanged(const TQString&)), kcfg_sortNormalView, TQT_SLOT(setText(const TQString&))); + connect(m_sortReconcileView, TQT_SIGNAL(settingsChanged(const TQString&)), kcfg_sortReconcileView, TQT_SLOT(setText(const TQString&))); + connect(m_sortSearchView, TQT_SIGNAL(settingsChanged(const TQString&)), kcfg_sortSearchView, TQT_SLOT(setText(const TQString&))); } KSettingsRegister::~KSettingsRegister() @@ -54,21 +54,21 @@ KSettingsRegister::~KSettingsRegister() void KSettingsRegister::slotLoadNormal(void) { // only need this once - disconnect(kcfg_sortNormalView, SIGNAL(textChanged()), this, SLOT(slotLoadNormal())); + disconnect(kcfg_sortNormalView, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadNormal())); m_sortNormalView->setSettings(kcfg_sortNormalView->text()); } void KSettingsRegister::slotLoadReconcile(void) { // only need this once - disconnect(kcfg_sortReconcileView, SIGNAL(textChanged()), this, SLOT(slotLoadReconcile())); + disconnect(kcfg_sortReconcileView, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadReconcile())); m_sortReconcileView->setSettings(kcfg_sortReconcileView->text()); } void KSettingsRegister::slotLoadSearch(void) { // only need this once - disconnect(kcfg_sortSearchView, SIGNAL(textChanged()), this, SLOT(slotLoadSearch())); + disconnect(kcfg_sortSearchView, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadSearch())); m_sortSearchView->setSettings(kcfg_sortSearchView->text()); } diff --git a/kmymoney2/dialogs/settings/ksettingsregister.h b/kmymoney2/dialogs/settings/ksettingsregister.h index bcad7eb..7fa475f 100644 --- a/kmymoney2/dialogs/settings/ksettingsregister.h +++ b/kmymoney2/dialogs/settings/ksettingsregister.h @@ -31,9 +31,10 @@ class KSettingsRegister : public KSettingsRegisterDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsRegister(QWidget* parent = 0, const char* name = 0); + KSettingsRegister(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsRegister(); protected slots: diff --git a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui index c03807e..1ad71bf 100644 --- a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSettingsRegisterDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSettingsRegisterDecl</cstring> </property> @@ -19,11 +19,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tab</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowGrid</cstring> </property> @@ -45,7 +45,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_LedgerLens</cstring> </property> @@ -59,7 +59,7 @@ <string>Using the ledger lens shows the details for the transaction that has focus in the ledger. Usually, when using the transaction form, only a one line summary is displayed for each transaction as the details are shown in the form.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_TransactionForm</cstring> </property> @@ -67,7 +67,7 @@ <string>Show transaction form</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AlwaysShowNrField</cstring> </property> @@ -78,7 +78,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowFancyMarker</cstring> </property> @@ -92,7 +92,7 @@ <string>Draws a larger header above each group of transaction. The grouping depends on the current sort order.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowFiscalMarker</cstring> </property> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -119,7 +119,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>sorting</cstring> </property> @@ -130,11 +130,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget3</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -157,7 +157,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -180,7 +180,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -214,7 +214,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -225,7 +225,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_CopyTypeToNr</cstring> </property> @@ -233,7 +233,7 @@ <string>Insert transaction type into No. field for new transactions</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AutoIncCheckNumber</cstring> </property> @@ -244,7 +244,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_FocusChangeIsEnter</cstring> </property> @@ -252,7 +252,7 @@ <string>Keep changes when selecting a different transaction/split</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_EnterMovesBetweenFields</cstring> </property> @@ -263,7 +263,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_stringMatchFromStart</cstring> </property> @@ -274,15 +274,15 @@ <string>Mark this option, if you always want to match names e.g. for payees from the start. If unset, any substring is matched.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> @@ -332,7 +332,7 @@ </spacer> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>kcfg_AutoFillTransaction</cstring> </property> @@ -349,7 +349,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1</cstring> </property> @@ -360,15 +360,15 @@ <string>Don't do autofill of transaction data at all.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton2</cstring> </property> @@ -398,7 +398,7 @@ Selecting 0% will list all transactions.</string> <string>Two transactions are usually treated identical for autofill, if they refer the same accounts. They are treated as different transactions though, when their amount varies by more than the percentage given here.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -409,7 +409,7 @@ Selecting 0% will list all transactions.</string> </widget> </hbox> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton3</cstring> </property> @@ -432,7 +432,7 @@ Selecting 0% will list all transactions.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -441,7 +441,7 @@ Selecting 0% will list all transactions.</string> </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -452,15 +452,15 @@ Selecting 0% will list all transactions.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -498,7 +498,7 @@ Selecting 0% will list all transactions.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> @@ -507,7 +507,7 @@ Selecting 0% will list all transactions.</string> </spacer> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_askForPayeeCategory</cstring> </property> @@ -531,7 +531,7 @@ Selecting 0% will list all transactions.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> @@ -545,5 +545,8 @@ Selecting 0% will list all transactions.</string> </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/transactionsortoption.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/settings/ksettingsschedules.cpp b/kmymoney2/dialogs/settings/ksettingsschedules.cpp index 6f9a77c..05dc80f 100644 --- a/kmymoney2/dialogs/settings/ksettingsschedules.cpp +++ b/kmymoney2/dialogs/settings/ksettingsschedules.cpp @@ -25,8 +25,8 @@ #include "ksettingsschedules.h" -KSettingsSchedules::KSettingsSchedules(QWidget* parent, const char* name) : - KSettingsSchedulesDecl(parent, name) +KSettingsSchedules::KSettingsSchedules(TQWidget* tqparent, const char* name) : + KSettingsSchedulesDecl(tqparent, name) { } diff --git a/kmymoney2/dialogs/settings/ksettingsschedules.h b/kmymoney2/dialogs/settings/ksettingsschedules.h index caa7d33..06e5af6 100644 --- a/kmymoney2/dialogs/settings/ksettingsschedules.h +++ b/kmymoney2/dialogs/settings/ksettingsschedules.h @@ -32,9 +32,10 @@ class KSettingsSchedules : public KSettingsSchedulesDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsSchedules(QWidget* parent = 0, const char* name = 0); + KSettingsSchedules(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsSchedules(); }; #endif diff --git a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui b/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui index fca9aa9..4f7bd28 100644 --- a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSettingsSchedulesDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSettingsSchedulesDecl</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_CheckSchedule</cstring> </property> @@ -38,7 +38,7 @@ <string>Check schedules on startup</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_dayCountFrame</cstring> </property> @@ -55,7 +55,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -63,7 +63,7 @@ <string>Enter transactions this number of days in advance</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_CheckSchedulePreview</cstring> </property> @@ -72,15 +72,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>21</height> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -141,5 +141,5 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp index c53d3c6..91f60b8 100644 --- a/kmymoney2/dialogs/transactioneditor.cpp +++ b/kmymoney2/dialogs/transactioneditor.cpp @@ -18,12 +18,12 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qlabel.h> -#include <qapplication.h> -#include <qeventloop.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qtooltip.h> +#include <tqlabel.h> +#include <tqapplication.h> +#include <tqeventloop.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqtooltip.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -60,7 +60,7 @@ using namespace KMyMoneyRegister; using namespace KMyMoneyTransactionForm; -TransactionEditor::TransactionEditor(TransactionEditorContainer* regForm, KMyMoneyRegister::Transaction* item, const KMyMoneyRegister::SelectedTransactions& list, const QDate& lastPostDate) : +TransactionEditor::TransactionEditor(TransactionEditorContainer* regForm, KMyMoneyRegister::Transaction* item, const KMyMoneyRegister::SelectedTransactions& list, const TQDate& lastPostDate) : m_transactions(list), m_regForm(regForm), m_item(item), @@ -70,14 +70,14 @@ TransactionEditor::TransactionEditor(TransactionEditorContainer* regForm, KMyMon m_openEditSplits(false) { m_item->startEditMode(); - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotUpdateAccount())); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotUpdateAccount())); } TransactionEditor::~TransactionEditor() { // Make sure the widgets do not send out signals to the editor anymore // After all, the editor is about to die - QMap<QString, QWidget*>::iterator it_w; + TQMap<TQString, TQWidget*>::iterator it_w; for(it_w = m_editWidgets.begin(); it_w != m_editWidgets.end(); ++it_w) { (*it_w)->disconnect(this); } @@ -87,7 +87,7 @@ TransactionEditor::~TransactionEditor() emit finishEdit(m_transactions); } -void TransactionEditor::slotUpdateAccount(const QString& id) +void TransactionEditor::slotUpdateAccount(const TQString& id) { m_account = MyMoneyFile::instance()->account(id); setupPrecision(); @@ -103,24 +103,24 @@ void TransactionEditor::slotUpdateAccount(void) void TransactionEditor::setupPrecision(void) { const int prec = (m_account.id().isEmpty()) ? 2 : MyMoneyMoney::denomToPrec(m_account.fraction()); - QStringList widgets = QStringList::split(",", "amount,deposit,payment"); - QStringList::const_iterator it_w; + TQStringList widgets = TQStringList::split(",", "amount,deposit,payment"); + TQStringList::const_iterator it_w; for(it_w = widgets.begin(); it_w != widgets.end(); ++it_w) { - QWidget * w; + TQWidget * w; if((w = haveWidget(*it_w)) != 0) { dynamic_cast<kMyMoneyEdit*>(w)->setPrecision(prec); } } } -void TransactionEditor::setup(QWidgetList& tabOrderWidgets, const MyMoneyAccount& account, KMyMoneyRegister::Action action) +void TransactionEditor::setup(TQWidgetList& tabOrderWidgets, const MyMoneyAccount& account, KMyMoneyRegister::Action action) { m_account = account; m_initialAction = action; createEditWidgets(); m_regForm->arrangeEditWidgets(m_editWidgets, m_item); m_regForm->tabOrder(tabOrderWidgets, m_item); - QWidget* w = haveWidget("tabbar"); + TQWidget* w = haveWidget("tabbar"); if(w) tabOrderWidgets.append(w); loadEditWidgets(action); @@ -135,7 +135,7 @@ void TransactionEditor::clearFinalWidgets(void) m_finalEditWidgets.clear(); } -void TransactionEditor::addFinalWidget(const QWidget* w) +void TransactionEditor::addFinalWidget(const TQWidget* w) { if(w) { m_finalEditWidgets << w; @@ -146,11 +146,11 @@ void TransactionEditor::slotReloadEditWidgets(void) { } -bool TransactionEditor::eventFilter(QObject* o, QEvent* e) +bool TransactionEditor::eventFilter(TQObject* o, TQEvent* e) { bool rc = false; - if(o == haveWidget("number")) { - if(e->type() == QEvent::MouseButtonDblClick) { + if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(haveWidget("number"))) { + if(e->type() == TQEvent::MouseButtonDblClick) { emit assignNumber(); rc = true; } @@ -159,15 +159,15 @@ bool TransactionEditor::eventFilter(QObject* o, QEvent* e) // if the object is a widget, the event is a key press event and // the object is one of our edit widgets, then .... if(o->isWidgetType() - && (e->type() == QEvent::KeyPress) - && m_editWidgets.values().contains(dynamic_cast<QWidget*>(o))) { - QKeyEvent* k = dynamic_cast<QKeyEvent*>(e); - if((k->state() & Qt::KeyButtonMask) == 0) { + && (e->type() == TQEvent::KeyPress) + && m_editWidgets.values().tqcontains(dynamic_cast<TQWidget*>(o))) { + TQKeyEvent* k = dynamic_cast<TQKeyEvent*>(e); + if((k->state() & TQt::KeyButtonMask) == 0) { bool isFinal = false; - QValueList<const QWidget*>::const_iterator it_w; + TQValueList<const TQWidget*>::const_iterator it_w; switch(k->key()) { - case Qt::Key_Return: - case Qt::Key_Enter: + case TQt::Key_Return: + case TQt::Key_Enter: // we check, if the object is one of the m_finalEditWidgets and if it's // a kMyMoneyEdit object that the value is not 0. If any of that is the // case, it's the final object. In other cases, we convert the enter @@ -176,7 +176,7 @@ bool TransactionEditor::eventFilter(QObject* o, QEvent* e) // we treat the return/enter key as such. if(KMyMoneyGlobalSettings::enterMovesBetweenFields()) { for(it_w = m_finalEditWidgets.begin(); !isFinal && it_w != m_finalEditWidgets.end(); ++it_w) { - if(*it_w == o) { + if(TQT_BASE_OBJECT_CONST(*it_w) == TQT_BASE_OBJECT(o)) { if(dynamic_cast<const kMyMoneyEdit*>(*it_w)) { isFinal = !(dynamic_cast<const kMyMoneyEdit*>(*it_w)->value().isZero()); } else @@ -188,25 +188,25 @@ bool TransactionEditor::eventFilter(QObject* o, QEvent* e) // for the non-final objects, we treat the return key as a TAB if(!isFinal) { - QKeyEvent evt(e->type(), - Key_Tab, 0, k->state(), QString::null, + TQKeyEvent evt(e->type(), + Key_Tab, 0, k->state(), TQString(), k->isAutoRepeat(), k->count()); - QApplication::sendEvent( o, &evt ); + TQApplication::sendEvent( o, &evt ); // in case of a category item and the split button is visible // send a second event so that we get passed the button. if(dynamic_cast<KMyMoneyCategory*>(o) && dynamic_cast<KMyMoneyCategory*>(o)->splitButton()) - QApplication::sendEvent( o, &evt ); + TQApplication::sendEvent( o, &evt ); } else { - QTimer::singleShot(0, this, SIGNAL(returnPressed())); + TQTimer::singleShot(0, this, TQT_SIGNAL(returnPressed())); } // don't process any further rc = true; break; - case Qt::Key_Escape: - QTimer::singleShot(0, this, SIGNAL(escapePressed())); + case TQt::Key_Escape: + TQTimer::singleShot(0, this, TQT_SIGNAL(escapePressed())); break; } } @@ -214,13 +214,13 @@ bool TransactionEditor::eventFilter(QObject* o, QEvent* e) return rc; } -void TransactionEditor::slotNumberChanged(const QString& txt) +void TransactionEditor::slotNumberChanged(const TQString& txt) { kMyMoneyLineEdit* number = dynamic_cast<kMyMoneyLineEdit*>(haveWidget("number")); if(number) { if(MyMoneyFile::instance()->checkNoUsed(m_account.id(), txt)) { - if(KMessageBox::questionYesNo(m_regForm, QString("<qt>")+i18n("The number <b>%1</b> has already been used in account <b>%2</b>. Do you want to replace it with the next available number?").arg(txt).arg(m_account.name())+QString("</qt>"), i18n("Duplicate number")) == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(m_regForm, TQString("<qt>")+i18n("The number <b>%1</b> has already been used in account <b>%2</b>. Do you want to replace it with the next available number?").tqarg(txt).tqarg(m_account.name())+TQString("</qt>"), i18n("Duplicate number")) == KMessageBox::Yes) { number->loadText(KMyMoneyUtils::nextCheckNumber(m_account)); } } @@ -229,18 +229,18 @@ void TransactionEditor::slotNumberChanged(const QString& txt) void TransactionEditor::slotUpdateButtonState(void) { - QString reason; + TQString reason; emit transactionDataSufficient(isComplete(reason)); } -QWidget* TransactionEditor::haveWidget(const QString& name) const +TQWidget* TransactionEditor::haveWidget(const TQString& name) const { return m_editWidgets.haveWidget(name); } int TransactionEditor::slotEditSplits(void) { - return QDialog::Rejected; + return TQDialog::Rejected; } #if 0 @@ -301,12 +301,12 @@ int TransactionEditor::slotEditSplits(void) } acc = MyMoneyAccount(); } - QString msg; - msg = QString("<p>")+i18n("This transaction has more than two splits and is based on a different currency (%1). Using this account to modify the transaction is currently not very well supported by KMyMoney and may result in false results.").arg(sec.name())+QString(" "); + TQString msg; + msg = TQString("<p>")+i18n("This transaction has more than two splits and is based on a different currency (%1). Using this account to modify the transaction is currently not very well supported by KMyMoney and may result in false results.").tqarg(sec.name())+TQString(" "); if(acc.id().isEmpty()) { msg += i18n("KMyMoney was not able to find a more appropriate account to edit this transaction. Nevertheless, you are allowed to modify the transaction. If you don't want to edit this transaction, please cancel from editing next."); } else { - msg += i18n("Using e.g. <b>%1</b> to edit this transaction is a better choice. Nevertheless, you are allowed to modify the transaction. If you want to use the suggested account instead, please cancel from editing next and change the view to the suggested account.").arg(acc.name()); + msg += i18n("Using e.g. <b>%1</b> to edit this transaction is a better choice. Nevertheless, you are allowed to modify the transaction. If you want to use the suggested account instead, please cancel from editing next and change the view to the suggested account.").tqarg(acc.name()); } KMessageBox::information(0, msg); } @@ -405,16 +405,16 @@ bool TransactionEditor::fixTransactionCommodity(const MyMoneyAccount& account) // this will happen and allow him to stop the processing (rc = false) try { - QString msg; + TQString msg; if(firstTimeMultiCurrency) { firstTimeMultiCurrency = false; if(!isMultiSelection()) { - msg = i18n("This transaction has more than two splits and is originally based on a different currency (%1). Using this account to modify the transaction may result in rounding errors. Do you want to continue?").arg(osec.name()); + msg = i18n("This transaction has more than two splits and is originally based on a different currency (%1). Using this account to modify the transaction may result in rounding errors. Do you want to continue?").tqarg(osec.name()); } else { - msg = i18n("At least one of the selected transactions has more than two splits and is originally based on a different currency (%1). Using this account to modify the transactions may result in rounding errors. Do you want to continue?").arg(osec.name()); + msg = i18n("At least one of the selected transactions has more than two splits and is originally based on a different currency (%1). Using this account to modify the transactions may result in rounding errors. Do you want to continue?").tqarg(osec.name()); } - if(KMessageBox::warningContinueCancel(0, QString("<qt>%1</qt>").arg(msg)) == KMessageBox::Cancel) { + if(KMessageBox::warningContinueCancel(0, TQString("<qt>%1</qt>").tqarg(msg)) == KMessageBox::Cancel) { rc = false; } } @@ -423,7 +423,7 @@ bool TransactionEditor::fixTransactionCommodity(const MyMoneyAccount& account) MyMoneyMoney price; if(!(*it_t).split().shares().isZero() && !(*it_t).split().value().isZero()) price = (*it_t).split().shares() / (*it_t).split().value(); - QValueList<MyMoneySplit>::iterator it_s; + TQValueList<MyMoneySplit>::iterator it_s; MyMoneySplit& mySplit = (*it_t).split(); for(it_s = (*it_t).transaction().splits().begin(); it_s != (*it_t).transaction().splits().end(); ++it_s) { MyMoneySplit s = (*it_s); @@ -472,9 +472,9 @@ bool TransactionEditor::canAssignNumber(void) const return (number != 0) && (number->text().isEmpty()); } -void TransactionEditor::setupCategoryWidget(KMyMoneyCategory* category, const QValueList<MyMoneySplit>& splits, QString& categoryId, const char* splitEditSlot, bool /* allowObjectCreation */) +void TransactionEditor::setupCategoryWidget(KMyMoneyCategory* category, const TQValueList<MyMoneySplit>& splits, TQString& categoryId, const char* splitEditSlot, bool /* allowObjectCreation */) { - disconnect(category, SIGNAL(focusIn()), this, splitEditSlot); + disconnect(category, TQT_SIGNAL(focusIn()), this, splitEditSlot); #if 0 // FIXME must deal with the logic that suppressObjectCreation is // automatically turned off when the createItem() signal is connected @@ -484,13 +484,13 @@ void TransactionEditor::setupCategoryWidget(KMyMoneyCategory* category, const QV switch(splits.count()) { case 0: - categoryId = QString(); + categoryId = TQString(); if(!category->currentText().isEmpty()) { category->setCurrentText(); // make sure, we don't see the selector category->completion()->hide(); } - category->completion()->setSelected(QString()); + category->completion()->setSelected(TQString()); break; case 1: @@ -500,9 +500,9 @@ void TransactionEditor::setupCategoryWidget(KMyMoneyCategory* category, const QV break; default: - categoryId = QString(); + categoryId = TQString(); category->setSplitTransaction(); - connect(category, SIGNAL(focusIn()), this, splitEditSlot); + connect(category, TQT_SIGNAL(focusIn()), this, splitEditSlot); #if 0 // FIXME must deal with the logic that suppressObjectCreation is // automatically turned off when the createItem() signal is connected @@ -513,17 +513,17 @@ void TransactionEditor::setupCategoryWidget(KMyMoneyCategory* category, const QV } } -bool TransactionEditor::enterTransactions(QString& newId, bool askForSchedule, bool suppressBalanceWarnings) +bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule, bool suppressBalanceWarnings) { - newId = QString(); + newId = TQString(); MyMoneyFile* file = MyMoneyFile::instance(); // make sure to run through all stuff that is tied to 'focusout events'. - m_regForm->parentWidget()->setFocus(); - QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput, 10); + m_regForm->tqparentWidget()->setFocus(); + TQApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 10); // we don't need to update our widgets anymore, so we just disconnect the signal - disconnect(file, SIGNAL(dataChanged()), this, SLOT(slotReloadEditWidgets())); + disconnect(file, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotReloadEditWidgets())); KMyMoneyRegister::SelectedTransactions::iterator it_t; MyMoneyTransaction t; @@ -538,7 +538,7 @@ bool TransactionEditor::enterTransactions(QString& newId, bool askForSchedule, b // collect the transactions to be stored in the engine in a local // list first, so that the user has a chance to interrupt the storage // process - QValueList<MyMoneyTransaction> list; + TQValueList<MyMoneyTransaction> list; bool storeTransactions = true; // collect transactions @@ -562,12 +562,12 @@ bool TransactionEditor::enterTransactions(QString& newId, bool askForSchedule, b MyMoneyFileTransaction ft; try { - QValueList<MyMoneyTransaction>::iterator it_ts; - QMap<QString, bool> minBalanceEarly; - QMap<QString, bool> minBalanceAbsolute; - QMap<QString, bool> maxCreditEarly; - QMap<QString, bool> maxCreditAbsolute; - QMap<QString, bool> accountIds; + TQValueList<MyMoneyTransaction>::iterator it_ts; + TQMap<TQString, bool> minBalanceEarly; + TQMap<TQString, bool> minBalanceAbsolute; + TQMap<TQString, bool> maxCreditEarly; + TQMap<TQString, bool> maxCreditAbsolute; + TQMap<TQString, bool> accountIds; for(it_ts = list.begin(); it_ts != list.end(); ++it_ts) { // if we have a categorization, make sure we remove @@ -576,7 +576,7 @@ bool TransactionEditor::enterTransactions(QString& newId, bool askForSchedule, b (*it_ts).setImported(false); // create information about min and max balances - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; for(it_s = (*it_ts).splits().begin(); it_s != (*it_ts).splits().end(); ++it_s) { MyMoneyAccount acc = file->account((*it_s).accountId()); accountIds[acc.id()] = true; @@ -599,19 +599,19 @@ bool TransactionEditor::enterTransactions(QString& newId, bool askForSchedule, b if((*it_ts).id().isEmpty()) { bool enter = true; - if(askForSchedule && (*it_ts).postDate() > QDate::currentDate()) { + if(askForSchedule && (*it_ts).postDate() > TQDate::tqcurrentDate()) { KGuiItem enterItem; KIconLoader* il = KGlobal::iconLoader(); KGuiItem enterButton( i18n("&Enter" ), - QIconSet(il->loadIcon("kontact_journal", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("kontact_journal", KIcon::Small, KIcon::SizeSmall)), i18n("Accepts the entered data and stores it"), i18n("Use this to enter the transaction into the ledger.")); KGuiItem scheduleButton( i18n("&Schedule" ), - QIconSet(il->loadIcon("kontact_date", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("kontact_date", KIcon::Small, KIcon::SizeSmall)), i18n("Accepts the entered data and stores it as schedule"), i18n("Use this to schedule the transaction for later entry into the ledger.")); - enter = KMessageBox::questionYesNo(m_regForm, QString("<qt>%1</qt>").arg(i18n("The transaction you are about to enter has a post date in the future.<br/><br/>Do you want to enter it in the ledger or add it to the schedules?")), i18n("Dialog caption for 'Enter or schedule' dialog", "Enter or schedule?"), enterButton, scheduleButton, "EnterOrScheduleTransactionInFuture") == KMessageBox::Yes; + enter = KMessageBox::questionYesNo(m_regForm, TQString("<qt>%1</qt>").tqarg(i18n("The transaction you are about to enter has a post date in the future.<br/><br/>Do you want to enter it in the ledger or add it to the schedules?")), i18n("Dialog caption for 'Enter or schedule' dialog", "Enter or schedule?"), enterButton, scheduleButton, "EnterOrScheduleTransactionInFuture") == KMessageBox::Yes; } if(enter) { // add new transaction @@ -623,7 +623,7 @@ bool TransactionEditor::enterTransactions(QString& newId, bool askForSchedule, b t = (*it_ts); // if a new transaction has a valid number, keep it with the account - QString number = (*it_ts).splits()[0].number(); + TQString number = (*it_ts).splits()[0].number(); if(!number.isEmpty()) { m_account.setValue("lastNumberUsed", number); file->modifyAccount(m_account); @@ -667,37 +667,37 @@ bool TransactionEditor::enterTransactions(QString& newId, bool askForSchedule, b ft.commit(); // now analyse the balances and spit out warnings to the user - QMap<QString, bool>::const_iterator it_a; + TQMap<TQString, bool>::const_iterator it_a; if(!suppressBalanceWarnings) { for(it_a = accountIds.begin(); it_a != accountIds.end(); ++it_a) { - QString msg; + TQString msg; MyMoneyAccount acc = file->account(it_a.key()); MyMoneyMoney balance = file->balance(acc.id()); const MyMoneySecurity& sec = file->security(acc.currencyId()); - QString key; + TQString key; key = "minBalanceEarly"; if(!acc.value(key).isEmpty()) { if(minBalanceEarly[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) { - msg = QString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the warning balance of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); + msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the warning balance of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); } } key = "minBalanceAbsolute"; if(!acc.value(key).isEmpty()) { if(minBalanceAbsolute[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) { - msg = QString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the minimum balance of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); + msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the minimum balance of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); } } key = "maxCreditEarly"; if(!acc.value(key).isEmpty()) { if(maxCreditEarly[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) { - msg = QString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the maximum credit warning limit of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); + msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the maximum credit warning limit of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); } } key = "maxCreditAbsolute"; if(!acc.value(key).isEmpty()) { if(maxCreditAbsolute[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) { - msg = QString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the maximum credit limit of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); + msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the maximum credit limit of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); } } @@ -713,7 +713,7 @@ bool TransactionEditor::enterTransactions(QString& newId, bool askForSchedule, b } emit statusProgress(-1, -1); - emit statusMsg(QString()); + emit statusMsg(TQString()); } return storeTransactions; @@ -724,7 +724,7 @@ StdTransactionEditor::StdTransactionEditor() { } -StdTransactionEditor::StdTransactionEditor(TransactionEditorContainer* regForm, KMyMoneyRegister::Transaction* item, const KMyMoneyRegister::SelectedTransactions& list, const QDate& lastPostDate) : +StdTransactionEditor::StdTransactionEditor(TransactionEditorContainer* regForm, KMyMoneyRegister::Transaction* item, const KMyMoneyRegister::SelectedTransactions& list, const TQDate& lastPostDate) : TransactionEditor(regForm, item, list, lastPostDate), m_inUpdateVat(false) { @@ -738,15 +738,15 @@ StdTransactionEditor::~StdTransactionEditor() } } -bool StdTransactionEditor::eventFilter(QObject* o, QEvent* e) +bool StdTransactionEditor::eventFilter(TQObject* o, TQEvent* e) { bool rc = TransactionEditor::eventFilter(o, e); #if 0 // this is sofar dead code here, as the focus out event for Comboboxes // never comes along here. I don't know why (ipwizard - 2009-10-03) - if((e->type() == QEvent::FocusOut) - && (haveWidget("payee") == dynamic_cast<QWidget*>(o))) { + if((e->type() == TQEvent::FocusOut) + && (haveWidget("payee") == dynamic_cast<TQWidget*>(o))) { // loosing the focus on the payee widget? qDebug("Loosing focus on payee"); KMyMoneyPayeeCombo* p = dynamic_cast<KMyMoneyPayeeCombo*>(haveWidget("payee")); @@ -762,25 +762,25 @@ void StdTransactionEditor::createEditWidgets(void) KMyMoneyCategory* account = new KMyMoneyCategory; account->setHint(i18n("Account")); m_editWidgets["account"] = account; - connect(account, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); - connect(account, SIGNAL(itemSelected(const QString&)), this, SLOT(slotUpdateAccount(const QString&))); + connect(account, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); + connect(account, TQT_SIGNAL(itemSelected(const TQString&)), this, TQT_SLOT(slotUpdateAccount(const TQString&))); KMyMoneyPayeeCombo* payee = new KMyMoneyPayeeCombo; payee->setHint(i18n("Payer/Receiver")); m_editWidgets["payee"] = payee; - connect(payee, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); - connect(payee, SIGNAL(createItem(const QString&, QString&)), this, SIGNAL(createPayee(const QString&, QString&))); - connect(payee, SIGNAL(objectCreation(bool)), this, SIGNAL(objectCreation(bool))); - connect(payee, SIGNAL(itemSelected(const QString&)), this, SLOT(slotUpdatePayee(const QString&))); + connect(payee, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); + connect(payee, TQT_SIGNAL(createItem(const TQString&, TQString&)), this, TQT_SIGNAL(createPayee(const TQString&, TQString&))); + connect(payee, TQT_SIGNAL(objectCreation(bool)), this, TQT_SIGNAL(objectCreation(bool))); + connect(payee, TQT_SIGNAL(itemSelected(const TQString&)), this, TQT_SLOT(slotUpdatePayee(const TQString&))); KMyMoneyCategory* category = new KMyMoneyCategory(0, 0, true); category->setHint(i18n("Category/Account")); m_editWidgets["category"] = category; - connect(category, SIGNAL(itemSelected(const QString&)), this, SLOT(slotUpdateCategory(const QString&))); - connect(category, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); - connect(category, SIGNAL(createItem(const QString&, QString&)), this, SLOT(slotCreateCategory(const QString&, QString&))); - connect(category, SIGNAL(objectCreation(bool)), this, SIGNAL(objectCreation(bool))); - connect(category->splitButton(), SIGNAL(clicked()), this, SLOT(slotEditSplits())); + connect(category, TQT_SIGNAL(itemSelected(const TQString&)), this, TQT_SLOT(slotUpdateCategory(const TQString&))); + connect(category, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); + connect(category, TQT_SIGNAL(createItem(const TQString&, TQString&)), this, TQT_SLOT(slotCreateCategory(const TQString&, TQString&))); + connect(category, TQT_SIGNAL(objectCreation(bool)), this, TQT_SIGNAL(objectCreation(bool))); + connect(category->splitButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSplits())); category->splitButton()->setDisabled(true); KTextEdit* memo = new KTextEdit; @@ -812,41 +812,41 @@ void StdTransactionEditor::createEditWidgets(void) kMyMoneyLineEdit* number = new kMyMoneyLineEdit; number->setHint(i18n("Number")); m_editWidgets["number"] = number; - connect(number, SIGNAL(lineChanged(const QString&)), this, SLOT(slotNumberChanged(const QString&))); + connect(number, TQT_SIGNAL(lineChanged(const TQString&)), this, TQT_SLOT(slotNumberChanged(const TQString&))); // number->installEventFilter(this); } m_editWidgets["postdate"] = new kMyMoneyDateInput; - connect(m_editWidgets["postdate"], SIGNAL(dateChanged(const QDate&)), this, SLOT(slotUpdateButtonState())); + connect(m_editWidgets["postdate"], TQT_SIGNAL(dateChanged(const TQDate&)), this, TQT_SLOT(slotUpdateButtonState())); kMyMoneyEdit* value = new kMyMoneyEdit; m_editWidgets["amount"] = value; value->setResetButtonVisible(false); - connect(value, SIGNAL(valueChanged(const QString&)), this, SLOT(slotUpdateAmount(const QString&))); - connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); + connect(value, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotUpdateAmount(const TQString&))); + connect(value, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); value = new kMyMoneyEdit; m_editWidgets["payment"] = value; value->setResetButtonVisible(false); - connect(value, SIGNAL(valueChanged(const QString&)), this, SLOT(slotUpdatePayment(const QString&))); - connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); + connect(value, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotUpdatePayment(const TQString&))); + connect(value, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); value = new kMyMoneyEdit; m_editWidgets["deposit"] = value; value->setResetButtonVisible(false); - connect(value, SIGNAL(valueChanged(const QString&)), this, SLOT(slotUpdateDeposit(const QString&))); - connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateButtonState())); + connect(value, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotUpdateDeposit(const TQString&))); + connect(value, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); KMyMoneyCashFlowCombo* cashflow = new KMyMoneyCashFlowCombo(0, 0, m_account.accountGroup()); m_editWidgets["cashflow"] = cashflow; - connect(cashflow, SIGNAL(directionSelected(KMyMoneyRegister::CashFlowDirection)), this, SLOT(slotUpdateCashFlow(KMyMoneyRegister::CashFlowDirection))); - connect(cashflow, SIGNAL(directionSelected(KMyMoneyRegister::CashFlowDirection)), this, SLOT(slotUpdateButtonState())); + connect(cashflow, TQT_SIGNAL(directionSelected(KMyMoneyRegister::CashFlowDirection)), this, TQT_SLOT(slotUpdateCashFlow(KMyMoneyRegister::CashFlowDirection))); + connect(cashflow, TQT_SIGNAL(directionSelected(KMyMoneyRegister::CashFlowDirection)), this, TQT_SLOT(slotUpdateButtonState())); KMyMoneyReconcileCombo* reconcile = new KMyMoneyReconcileCombo; m_editWidgets["status"] = reconcile; - connect(reconcile, SIGNAL(itemSelected(const QString&)), this, SLOT(slotUpdateButtonState())); + connect(reconcile, TQT_SIGNAL(itemSelected(const TQString&)), this, TQT_SLOT(slotUpdateButtonState())); - KMyMoneyRegister::QWidgetContainer::iterator it_w; + KMyMoneyRegister::TQWidgetContainer::iterator it_w; for(it_w = m_editWidgets.begin(); it_w != m_editWidgets.end(); ++it_w) { (*it_w)->installEventFilter(this); } @@ -857,9 +857,9 @@ void StdTransactionEditor::createEditWidgets(void) cashflow->removeDontCare(); } - QLabel* label; - m_editWidgets["category-label"] = label = new QLabel(i18n("Category"), 0); - label->setAlignment(Qt::AlignVCenter | Qt::DontClip); + TQLabel* label; + m_editWidgets["category-label"] = label = new TQLabel(i18n("Category"), 0); + label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); // create a copy of tabbar above the form (if we are created for a form) KMyMoneyTransactionForm::TransactionForm* form = dynamic_cast<KMyMoneyTransactionForm::TransactionForm*>(m_regForm); @@ -868,29 +868,29 @@ void StdTransactionEditor::createEditWidgets(void) KMyMoneyTransactionForm::TabBar* tabbar = new KMyMoneyTransactionForm::TabBar; m_editWidgets["tabbar"] = tabbar; tabbar->copyTabs(form->tabBar()); - connect(tabbar, SIGNAL(tabSelected(int)), this, SLOT(slotUpdateAction(int))); + connect(tabbar, TQT_SIGNAL(tabSelected(int)), this, TQT_SLOT(slotUpdateAction(int))); } - label = new QLabel(i18n("Date"), 0); - label->setAlignment(Qt::AlignVCenter | Qt::DontClip); + label = new TQLabel(i18n("Date"), 0); + label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["date-label"] = label; - label = new QLabel(i18n("Number"), 0); - label->setAlignment(Qt::AlignVCenter | Qt::DontClip); + label = new TQLabel(i18n("Number"), 0); + label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["number-label"] = label; setupPrecision(); } -void StdTransactionEditor::setupCategoryWidget(QString& categoryId) +void StdTransactionEditor::setupCategoryWidget(TQString& categoryId) { - TransactionEditor::setupCategoryWidget(dynamic_cast<KMyMoneyCategory*>(m_editWidgets["category"]), m_splits, categoryId, SLOT(slotEditSplits())); + TransactionEditor::setupCategoryWidget(dynamic_cast<KMyMoneyCategory*>(m_editWidgets["category"]), m_splits, categoryId, TQT_SLOT(slotEditSplits())); if(m_splits.count() == 1) m_shares = m_splits[0].shares(); } -bool StdTransactionEditor::isTransfer(const QString& accId1, const QString& accId2) const +bool StdTransactionEditor::isTransfer(const TQString& accId1, const TQString& accId2) const { if(accId1.isEmpty() || accId2.isEmpty()) return false; @@ -903,8 +903,8 @@ void StdTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action action) // don't kick off VAT processing from here m_inUpdateVat = true; - QMap<QString, QWidget*>::const_iterator it_w; - QWidget* w; + TQMap<TQString, TQWidget*>::const_iterator it_w; + TQWidget* w; AccountSet aSet; // load the account widget @@ -929,11 +929,11 @@ void StdTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action action) // load the category widget KMyMoneyCategory* category = dynamic_cast<KMyMoneyCategory*>(m_editWidgets["category"]); - disconnect(category, SIGNAL(focusIn()), this, SLOT(slotEditSplits())); + disconnect(category, TQT_SIGNAL(focusIn()), this, TQT_SLOT(slotEditSplits())); // check if the current transaction has a reference to an equity account bool haveEquityAccount = false; - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; for(it_s = m_transaction.splits().begin(); !haveEquityAccount && it_s != m_transaction.splits().end(); ++it_s) { MyMoneyAccount acc = MyMoneyFile::instance()->account((*it_s).accountId()); if(acc.accountType() == MyMoneyAccount::Equity) @@ -966,7 +966,7 @@ void StdTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action action) else if(m_lastPostDate.isValid()) dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(m_lastPostDate); else - dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(QDate::currentDate()); + dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(TQDate::tqcurrentDate()); if((w = haveWidget("number")) != 0) { dynamic_cast<kMyMoneyLineEdit*>(w)->loadText(m_split.number()); @@ -979,23 +979,23 @@ void StdTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action action) } dynamic_cast<KMyMoneyReconcileCombo*>(m_editWidgets["status"])->setState(m_split.reconcileFlag()); - QString payeeId = m_split.payeeId(); + TQString payeeId = m_split.payeeId(); if(!payeeId.isEmpty()) { payee->setSelectedItem(payeeId); } m_splits.clear(); if(m_transaction.splitCount() < 2) { - category->completion()->setSelected(QString()); + category->completion()->setSelected(TQString()); } else { - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; for(it_s = m_transaction.splits().begin(); it_s != m_transaction.splits().end(); ++it_s) { if((*it_s) == m_split) continue; m_splits.append(*it_s); } } - QString categoryId; + TQString categoryId; setupCategoryWidget(categoryId); if((w = haveWidget("cashflow")) != 0) { @@ -1004,7 +1004,7 @@ void StdTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action action) } if((w = haveWidget("category-label")) != 0) { - QLabel *categoryLabel = dynamic_cast<QLabel*>(w); + TQLabel *categoryLabel = dynamic_cast<TQLabel*>(w); if(isTransfer(m_split.accountId(), categoryId)) { if(m_split.value().isPositive()) categoryLabel->setText(i18n("Transfer from")); @@ -1040,7 +1040,7 @@ void StdTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action action) } } if(action != KMyMoneyRegister::ActionNone) { - QLabel *categoryLabel = dynamic_cast<QLabel*>(w); + TQLabel *categoryLabel = dynamic_cast<TQLabel*>(w); if(action == KMyMoneyRegister::ActionTransfer) { if(m_split.value().isPositive()) categoryLabel->setText(i18n("Transfer from")); @@ -1071,7 +1071,7 @@ void StdTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action action) } } else { - dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->loadDate(QDate()); + dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->loadDate(TQDate()); dynamic_cast<KMyMoneyReconcileCombo*>(m_editWidgets["status"])->setState(MyMoneySplit::Unknown); if(haveWidget("deposit")) { dynamic_cast<kMyMoneyEdit*>(m_editWidgets["deposit"])->loadText(""); @@ -1092,16 +1092,16 @@ void StdTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action action) w->setEnabled(false); } - category->completion()->setSelected(QString()); + category->completion()->setSelected(TQString()); } // allow kick off VAT processing again m_inUpdateVat = false; } -QWidget* StdTransactionEditor::firstWidget(void) const +TQWidget* StdTransactionEditor::firstWidget(void) const { - QWidget* w = 0; + TQWidget* w = 0; if(m_initialAction != KMyMoneyRegister::ActionNone) w = haveWidget("payee"); return w; @@ -1111,7 +1111,7 @@ void StdTransactionEditor::slotReloadEditWidgets(void) { // reload category widget KMyMoneyCategory* category = dynamic_cast<KMyMoneyCategory*>(m_editWidgets["category"]); - QString categoryId = category->selectedItem(); + TQString categoryId = category->selectedItem(); AccountSet aSet; aSet.addAccountGroup(MyMoneyAccount::Asset); @@ -1133,7 +1133,7 @@ void StdTransactionEditor::slotReloadEditWidgets(void) // reload payee widget KMyMoneyPayeeCombo* payee = dynamic_cast<KMyMoneyPayeeCombo*>(m_editWidgets["payee"]); - QString payeeId = payee->selectedItem(); + TQString payeeId = payee->selectedItem(); payee->loadPayees(MyMoneyFile::instance()->payeeList()); @@ -1142,12 +1142,12 @@ void StdTransactionEditor::slotReloadEditWidgets(void) } } -void StdTransactionEditor::slotUpdatePayee(const QString& payeeId) +void StdTransactionEditor::slotUpdatePayee(const TQString& payeeId) { // we have a new payee assigned to this transaction. // retrieve some information about the state of the category widget KMyMoneyCategory* category = dynamic_cast<KMyMoneyCategory*>(m_editWidgets["category"]); - QStringList list; + TQStringList list; category->selectedItems(list); // If payee has associated default account (category), set that now if @@ -1173,9 +1173,9 @@ void StdTransactionEditor::slotUpdatePayee(const QString& payeeId) // check if all value fields are empty kMyMoneyEdit* amount; - QStringList fields; + TQStringList fields; fields << "amount" << "payment" << "deposit"; - QStringList::const_iterator it_f; + TQStringList::const_iterator it_f; for(it_f = fields.begin(); it_f != fields.end(); ++it_f) { amount = dynamic_cast<kMyMoneyEdit*>(haveWidget(*it_f)); if(amount && !amount->value().isZero()) @@ -1195,7 +1195,7 @@ void StdTransactionEditor::slotUpdatePayee(const QString& payeeId) // check if date has been altered by user kMyMoneyDateInput* postDate = dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"]); if((m_lastPostDate.isValid() && (postDate->date() != m_lastPostDate)) - || (!m_lastPostDate.isValid() && (postDate->date() != QDate::currentDate()))) + || (!m_lastPostDate.isValid() && (postDate->date() != TQDate::tqcurrentDate()))) return; #endif @@ -1207,7 +1207,7 @@ void StdTransactionEditor::slotUpdatePayee(const QString& payeeId) MyMoneyMoney StdTransactionEditor::shares(const MyMoneyTransaction& t) const { MyMoneyMoney result; - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; for(it_s = t.splits().begin(); it_s != t.splits().end(); ++it_s) { if((*it_s).accountId() == m_account.id()) { result += (*it_s).shares(); @@ -1221,9 +1221,9 @@ struct uniqTransaction { int cnt; }; -void StdTransactionEditor::autoFill(const QString& payeeId) +void StdTransactionEditor::autoFill(const TQString& payeeId) { - QValueList<QPair<MyMoneyTransaction, MyMoneySplit> > list; + TQValueList<TQPair<MyMoneyTransaction, MyMoneySplit> > list; MyMoneyTransactionFilter filter(m_account.id()); filter.addPayee(payeeId); MyMoneyFile::instance()->transactionList(list, filter); @@ -1231,17 +1231,17 @@ void StdTransactionEditor::autoFill(const QString& payeeId) // ok, we found at least one previous transaction. now we clear out // what we have collected so far and add those splits from // the previous transaction. - QValueList<QPair<MyMoneyTransaction, MyMoneySplit> >::const_iterator it_t; - QMap<QString, struct uniqTransaction> uniqList; + TQValueList<TQPair<MyMoneyTransaction, MyMoneySplit> >::const_iterator it_t; + TQMap<TQString, struct uniqTransaction> uniqList; // collect the transactions and see if we have any duplicates for(it_t = list.begin(); it_t != list.end(); ++it_t) { - QString key = (*it_t).first.accountSignature(); + TQString key = (*it_t).first.accountSignature(); int cnt = 0; - QMap<QString, struct uniqTransaction>::iterator it_u; + TQMap<TQString, struct uniqTransaction>::iterator it_u; do { - QString ukey = QString("%1-%2").arg(key).arg(cnt); - it_u = uniqList.find(ukey); + TQString ukey = TQString("%1-%2").tqarg(key).tqarg(cnt); + it_u = uniqList.tqfind(ukey); if(it_u == uniqList.end()) { uniqList[ukey].t = &((*it_t).first); uniqList[ukey].cnt = 1; @@ -1289,7 +1289,7 @@ void StdTransactionEditor::autoFill(const QString& payeeId) KSelectTransactionsDlg dlg(m_account, m_regForm); dlg.setCaption(i18n("Select autofill transaction")); - QMap<QString, struct uniqTransaction>::const_iterator it_u; + TQMap<TQString, struct uniqTransaction>::const_iterator it_u; for(it_u = uniqList.begin(); it_u != uniqList.end(); ++it_u) { dlg.addTransaction(*(*it_u).t); } @@ -1303,7 +1303,7 @@ void StdTransactionEditor::autoFill(const QString& payeeId) if(dlg.m_register->lastItem()) dlg.m_register->selectItem(dlg.m_register->lastItem()); - if(dlg.exec() == QDialog::Accepted) { + if(dlg.exec() == TQDialog::Accepted) { t = dlg.transaction(); } #if 0 @@ -1311,7 +1311,7 @@ void StdTransactionEditor::autoFill(const QString& payeeId) #endif } else { int maxCnt = 0; - QMap<QString, struct uniqTransaction>::const_iterator it_u; + TQMap<TQString, struct uniqTransaction>::const_iterator it_u; for(it_u = uniqList.begin(); it_u != uniqList.end(); ++it_u) { if((*it_u).cnt > maxCnt) { t = *(*it_u).t; @@ -1324,18 +1324,18 @@ void StdTransactionEditor::autoFill(const QString& payeeId) m_transaction.removeSplits(); m_split = MyMoneySplit(); MyMoneySplit otherSplit; - QValueList<MyMoneySplit>::ConstIterator it; + TQValueList<MyMoneySplit>::ConstIterator it; for(it = t.splits().begin(); it != t.splits().end(); ++it) { MyMoneySplit s(*it); s.setReconcileFlag(MyMoneySplit::NotReconciled); - s.setReconcileDate(QDate()); + s.setReconcileDate(TQDate()); s.clearId(); - s.setBankID(QString()); + s.setBankID(TQString()); // older versions of KMyMoney used to set the action // we don't need this anymore if(s.action() != MyMoneySplit::ActionAmortization && s.action() != MyMoneySplit::ActionInterest) { - s.setAction(QString()); + s.setAction(TQString()); } // FIXME update check number. The old comment contained @@ -1360,7 +1360,7 @@ void StdTransactionEditor::autoFill(const QString& payeeId) // the autofilled memo text which will then also be used // in this split. See createTransaction() for this logic. if(s.accountId() != m_account.id() && t.splitCount() == 2) - s.setMemo(QString()); + s.setMemo(TQString()); m_transaction.addSplit(s); if(s.accountId() == m_account.id() && m_split == MyMoneySplit()) { @@ -1381,14 +1381,14 @@ void StdTransactionEditor::autoFill(const QString& payeeId) } // now setup the widgets with the new data but keep the date - QDate date = dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->date(); + TQDate date = dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->date(); loadEditWidgets(action); dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(date); } } // focus jumps into the category field - QWidget* w; + TQWidget* w; if((w = haveWidget("payee")) != 0) { w->setFocus(); } @@ -1398,7 +1398,7 @@ void StdTransactionEditor::slotUpdateAction(int action) { TabBar* tabbar = dynamic_cast<TabBar*>(haveWidget("tabbar")); if(tabbar) { - QLabel* categoryLabel = dynamic_cast<QLabel*>(haveWidget("category-label")); + TQLabel* categoryLabel = dynamic_cast<TQLabel*>(haveWidget("category-label")); KMyMoneyCashFlowCombo* cashflow = dynamic_cast<KMyMoneyCashFlowCombo*>(m_editWidgets["cashflow"]); switch(action) { case KMyMoneyRegister::ActionDeposit: @@ -1419,7 +1419,7 @@ void StdTransactionEditor::slotUpdateAction(int action) void StdTransactionEditor::slotUpdateCashFlow(KMyMoneyRegister::CashFlowDirection dir) { - QLabel* categoryLabel = dynamic_cast<QLabel*>(haveWidget("category-label")); + TQLabel* categoryLabel = dynamic_cast<TQLabel*>(haveWidget("category-label")); // qDebug("Update cashflow to %d", dir); if(categoryLabel) { @@ -1440,9 +1440,9 @@ void StdTransactionEditor::slotUpdateCashFlow(KMyMoneyRegister::CashFlowDirectio } } -void StdTransactionEditor::slotUpdateCategory(const QString& id) +void StdTransactionEditor::slotUpdateCategory(const TQString& id) { - QLabel *categoryLabel = dynamic_cast<QLabel*>(haveWidget("category-label")); + TQLabel *categoryLabel = dynamic_cast<TQLabel*>(haveWidget("category-label")); // qDebug("Update category to %s", id.data()); if(categoryLabel) { @@ -1495,7 +1495,7 @@ void StdTransactionEditor::slotUpdateCategory(const QString& id) updateVAT(false); } -void StdTransactionEditor::slotUpdatePayment(const QString& txt) +void StdTransactionEditor::slotUpdatePayment(const TQString& txt) { MyMoneyMoney val(txt); @@ -1508,7 +1508,7 @@ void StdTransactionEditor::slotUpdatePayment(const QString& txt) updateVAT(); } -void StdTransactionEditor::slotUpdateDeposit(const QString& txt) +void StdTransactionEditor::slotUpdateDeposit(const TQString& txt) { MyMoneyMoney val(txt); if(val.isNegative()) { @@ -1520,7 +1520,7 @@ void StdTransactionEditor::slotUpdateDeposit(const QString& txt) updateVAT(); } -void StdTransactionEditor::slotUpdateAmount(const QString& txt) +void StdTransactionEditor::slotUpdateAmount(const TQString& txt) { // qDebug("Update amount to %s", txt.data()); MyMoneyMoney val(txt); @@ -1530,7 +1530,7 @@ void StdTransactionEditor::slotUpdateAmount(const QString& txt) void StdTransactionEditor::updateAmount(const MyMoneyMoney& val) { - QLabel *categoryLabel = dynamic_cast<QLabel*>(haveWidget("category-label")); + TQLabel *categoryLabel = dynamic_cast<TQLabel*>(haveWidget("category-label")); if(categoryLabel) { KMyMoneyCashFlowCombo* cashflow = dynamic_cast<KMyMoneyCashFlowCombo*>(m_editWidgets["cashflow"]); @@ -1615,8 +1615,8 @@ void StdTransactionEditor::updateVAT(bool amountChanged) // if we made this a split transaction, then move the // focus to the memo field - if(qApp->focusWidget() == haveWidget("category")) { - QWidget* w = haveWidget("memo"); + if(tqApp->tqfocusWidget() == haveWidget("category")) { + TQWidget* w = haveWidget("memo"); if(w) w->setFocus(); } @@ -1658,7 +1658,7 @@ bool StdTransactionEditor::addVatSplit(MyMoneyTransaction& tr, const MyMoneyMone tax.setAccountId(vatAcc.id()); // qDebug("vat amount is '%s'", category.value("VatAmount").latin1()); - if(category.value("VatAmount").lower() != QString("net")) { + if(category.value("VatAmount").lower() != TQString("net")) { // split value is the gross value gv = amount; nv = gv / (MyMoneyMoney(1,1) + vatRate); @@ -1698,7 +1698,7 @@ MyMoneyMoney StdTransactionEditor::removeVatSplit(void) MyMoneySplit t; // tax split bool netValue = false; - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; for(it_s = m_splits.begin(); it_s != m_splits.end(); ++it_s) { MyMoneyAccount acc = MyMoneyFile::instance()->account((*it_s).accountId()); if(!acc.value("VatAccount").isEmpty()) { @@ -1729,7 +1729,7 @@ MyMoneyMoney StdTransactionEditor::removeVatSplit(void) // block the signals to avoid popping up the split editor dialog // for nothing m_editWidgets["category"]->blockSignals(true); - QString id; + TQString id; setupCategoryWidget(id); m_editWidgets["category"]->blockSignals(false); @@ -1737,20 +1737,20 @@ MyMoneyMoney StdTransactionEditor::removeVatSplit(void) return amount; } -bool StdTransactionEditor::isComplete(QString& reason) const +bool StdTransactionEditor::isComplete(TQString& reason) const { - reason = QString(); - // reason.clear(); // for Qt4 + reason = TQString(); + // reason.clear(); // for TQt4 - QMap<QString, QWidget*>::const_iterator it_w; + TQMap<TQString, TQWidget*>::const_iterator it_w; kMyMoneyDateInput* postDate = dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"]); if(postDate) { postDate->markAsBadDate(); - QToolTip::remove(postDate); + TQToolTip::remove(postDate); if(postDate->date().isValid() && (postDate->date() < m_account.openingDate())) { postDate->markAsBadDate(true, KMyMoneyGlobalSettings::listNegativeValueColor()); reason = i18n("Cannot enter transaction with postdate prior to account's opening date."); - QToolTip::add(postDate, reason); + TQToolTip::add(postDate, reason); return false; } } @@ -1783,35 +1783,35 @@ bool StdTransactionEditor::isComplete(QString& reason) const return it_w != m_editWidgets.end(); } -void StdTransactionEditor::slotCreateCategory(const QString& name, QString& id) +void StdTransactionEditor::slotCreateCategory(const TQString& name, TQString& id) { - MyMoneyAccount acc, parent; + MyMoneyAccount acc, tqparent; acc.setName(name); KMyMoneyCashFlowCombo* cashflow = dynamic_cast<KMyMoneyCashFlowCombo*>(haveWidget("cashflow")); if(cashflow) { // form based input if(cashflow->direction() == KMyMoneyRegister::Deposit) - parent = MyMoneyFile::instance()->income(); + tqparent = MyMoneyFile::instance()->income(); else - parent = MyMoneyFile::instance()->expense(); + tqparent = MyMoneyFile::instance()->expense(); } else if(haveWidget("deposit")) { // register based input kMyMoneyEdit* deposit = dynamic_cast<kMyMoneyEdit*>(m_editWidgets["deposit"]); if(deposit->value().isPositive()) - parent = MyMoneyFile::instance()->income(); + tqparent = MyMoneyFile::instance()->income(); else - parent = MyMoneyFile::instance()->expense(); + tqparent = MyMoneyFile::instance()->expense(); } else - parent = MyMoneyFile::instance()->expense(); + tqparent = MyMoneyFile::instance()->expense(); // TODO extract possible first part of a hierarchy and check if it is one - // of our top categories. If so, remove it and select the parent + // of our top categories. If so, remove it and select the tqparent // according to this information. - emit createCategory(acc, parent); + emit createCategory(acc, tqparent); // return id id = acc.id(); @@ -1819,14 +1819,14 @@ void StdTransactionEditor::slotCreateCategory(const QString& name, QString& id) int StdTransactionEditor::slotEditSplits(void) { - int rc = QDialog::Rejected; + int rc = TQDialog::Rejected; if(!m_openEditSplits) { // only get in here in a single instance m_openEditSplits = true; // force focus change to update all data - QWidget* w = dynamic_cast<KMyMoneyCategory*>(m_editWidgets["category"])->splitButton(); + TQWidget* w = dynamic_cast<KMyMoneyCategory*>(m_editWidgets["category"])->splitButton(); if(w) w->setFocus(); @@ -1877,10 +1877,10 @@ int StdTransactionEditor::slotEditSplits(void) 0, m_priceInfo, m_regForm); - connect(dlg, SIGNAL(objectCreation(bool)), this, SIGNAL(objectCreation(bool))); - connect(dlg, SIGNAL(createCategory(MyMoneyAccount&, const MyMoneyAccount&)), this, SIGNAL(createCategory(MyMoneyAccount&, const MyMoneyAccount&))); + connect(dlg, TQT_SIGNAL(objectCreation(bool)), this, TQT_SIGNAL(objectCreation(bool))); + connect(dlg, TQT_SIGNAL(createCategory(MyMoneyAccount&, const MyMoneyAccount&)), this, TQT_SIGNAL(createCategory(MyMoneyAccount&, const MyMoneyAccount&))); - if((rc = dlg->exec()) == QDialog::Accepted) { + if((rc = dlg->exec()) == TQDialog::Accepted) { m_transaction = dlg->transaction(); m_split = m_transaction.splits()[0]; loadEditWidgets(); @@ -1900,7 +1900,7 @@ int StdTransactionEditor::slotEditSplits(void) return rc; } -void StdTransactionEditor::checkPayeeInSplit(MyMoneySplit& s, const QString& payeeId) +void StdTransactionEditor::checkPayeeInSplit(MyMoneySplit& s, const TQString& payeeId) { if(s.accountId().isEmpty()) return; @@ -1957,7 +1957,7 @@ bool StdTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyMone { // extract price info from original transaction m_priceInfo.clear(); - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; if(!torig.id().isEmpty()) { for(it_s = torig.splits().begin(); it_s != torig.splits().end(); ++it_s) { if((*it_s).id() != sorig.id()) { @@ -2006,7 +2006,7 @@ bool StdTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyMone } KMyMoneyPayeeCombo* payee = dynamic_cast<KMyMoneyPayeeCombo*>(m_editWidgets["payee"]); - QString payeeId; + TQString payeeId; if(!isMultiSelection() || (isMultiSelection() && !payee->currentText().isEmpty())) { payeeId = payee->selectedItem(); s0.setPayeeId(payeeId); @@ -2029,7 +2029,7 @@ bool StdTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyMone s0.setReconcileFlag(status->state()); if(s0.reconcileFlag() == MyMoneySplit::Reconciled && !s0.reconcileDate().isValid()) - s0.setReconcileDate(QDate::currentDate()); + s0.setReconcileDate(TQDate::tqcurrentDate()); checkPayeeInSplit(s0, payeeId); @@ -2040,7 +2040,7 @@ bool StdTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyMone // if we have none or only one other split, we reconstruct it here // if we have more than one other split, we take them as they are // make sure to perform all those changes on a local copy - QValueList<MyMoneySplit> splits = m_splits; + TQValueList<MyMoneySplit> splits = m_splits; MyMoneySplit s1; if(splits.count() == 0) { @@ -2056,7 +2056,7 @@ bool StdTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyMone // split or create it if(isMultiSelection()) { if(torig.splitCount() == 2) { - QValueList<MyMoneySplit>::const_iterator it_s; + TQValueList<MyMoneySplit>::const_iterator it_s; for(it_s = torig.splits().begin(); it_s != torig.splits().end(); ++it_s) { if((*it_s).id() == sorig.id()) continue; @@ -2109,7 +2109,7 @@ bool StdTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyMone return false; } else { MyMoneyAccount cat = MyMoneyFile::instance()->account(s1.accountId()); - if(m_priceInfo.find(cat.currencyId()) != m_priceInfo.end()) { + if(m_priceInfo.tqfind(cat.currencyId()) != m_priceInfo.end()) { shares = (s1.value() * m_priceInfo[cat.currencyId()]).reduce().convert(cat.fraction()); } else @@ -2124,7 +2124,7 @@ bool StdTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyMone t.addSplit(s1); } else { - QValueList<MyMoneySplit>::iterator it_s; + TQValueList<MyMoneySplit>::iterator it_s; for(it_s = splits.begin(); it_s != splits.end(); ++it_s) { s1 = *it_s; s1.clearId(); @@ -2143,7 +2143,7 @@ void StdTransactionEditor::setupFinalWidgets(void) addFinalWidget(haveWidget("status")); } -void StdTransactionEditor::slotUpdateAccount(const QString& id) +void StdTransactionEditor::slotUpdateAccount(const TQString& id) { TransactionEditor::slotUpdateAccount(id); KMyMoneyCategory* category = dynamic_cast<KMyMoneyCategory*>(m_editWidgets["category"]); diff --git a/kmymoney2/dialogs/transactioneditor.h b/kmymoney2/dialogs/transactioneditor.h index bf47598..72ecff8 100644 --- a/kmymoney2/dialogs/transactioneditor.h +++ b/kmymoney2/dialogs/transactioneditor.h @@ -21,8 +21,8 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qobject.h> -#include <qwidgetlist.h> +#include <tqobject.h> +#include <tqwidgetlist.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -38,12 +38,13 @@ class KCurrencyExchange; class KMyMoneyCategory; -class TransactionEditor : public QObject +class TransactionEditor : public TQObject { Q_OBJECT + TQ_OBJECT public: TransactionEditor() {} - TransactionEditor(TransactionEditorContainer* regForm, KMyMoneyRegister::Transaction* item, const KMyMoneyRegister::SelectedTransactions& list, const QDate& lastPostDate); + TransactionEditor(TransactionEditorContainer* regForm, KMyMoneyRegister::Transaction* item, const KMyMoneyRegister::SelectedTransactions& list, const TQDate& lastPostDate); virtual ~TransactionEditor(); /** @@ -57,12 +58,12 @@ public: * no account so all will be shown. I have no idea anymore, what I * tried to say with the first sentence above. :( Maybe this is crap. * - * @param tabOrderWidgets QWidgetList which will be filled with the pointers + * @param tabOrderWidgets TQWidgetList which will be filled with the pointers * to the editWidgets in their tab order * @param account account that is currently shown in the calling ledger view * @param action default action (defaults to ActionNone). */ - void setup(QWidgetList& tabOrderWidgets, const MyMoneyAccount& account = MyMoneyAccount(), KMyMoneyRegister::Action action = KMyMoneyRegister::ActionNone); + void setup(TQWidgetList& tabOrderWidgets, const MyMoneyAccount& account = MyMoneyAccount(), KMyMoneyRegister::Action action = KMyMoneyRegister::ActionNone); /** * Enter the transactions into the ledger. In case of a newly created @@ -73,7 +74,7 @@ public: * (the default) a warning will be displayed when the balance crosses the minimum * or maximum balance settings for the account. */ - virtual bool enterTransactions(QString& newId, bool askForSchedule = true, bool suppressBalanceWarnings = false); + virtual bool enterTransactions(TQString& newId, bool askForSchedule = true, bool suppressBalanceWarnings = false); /** * This method creates a transaction based on the contents of the current widgets, @@ -110,7 +111,7 @@ public: * * @sa transactionDataSufficient() */ - virtual bool isComplete(QString& reason) const = 0; + virtual bool isComplete(TQString& reason) const = 0; /** * This method returns information if the editor is started with multiple transactions @@ -130,28 +131,28 @@ public: * Returns a pointer to the widget that should receive * the focus after the editor has been started. */ - virtual QWidget* firstWidget(void) const = 0; + virtual TQWidget* firstWidget(void) const = 0; /** * Returns a pointer to a widget by name */ - QWidget* haveWidget(const QString& name) const; + TQWidget* haveWidget(const TQString& name) const; void setTransaction(const MyMoneyTransaction& t, const MyMoneySplit& s); - bool eventFilter(QObject* o, QEvent* e); + bool eventFilter(TQObject* o, TQEvent* e); const MyMoneyAccount& account(void) const { return m_account; } void clearFinalWidgets(void); - void addFinalWidget(const QWidget*); + void addFinalWidget(const TQWidget*); public slots: void slotReloadEditWidgets(void); /** - * The default implementation returns QDialog::Rejected + * The default implementation returns TQDialog::Rejected */ virtual int slotEditSplits(void); @@ -161,13 +162,13 @@ public slots: * * @param id of the account to be used */ - void slotUpdateAccount(const QString& id); + void slotUpdateAccount(const TQString& id); protected: virtual void createEditWidgets(void) = 0; virtual void setupFinalWidgets(void) = 0; virtual void loadEditWidgets(KMyMoneyRegister::Action action = KMyMoneyRegister::ActionNone) = 0; - void setupCategoryWidget(KMyMoneyCategory* category, const QValueList<MyMoneySplit>& splits, QString& categoryId, const char* splitEditSlot, bool allowObjectCreation = true); + void setupCategoryWidget(KMyMoneyCategory* category, const TQValueList<MyMoneySplit>& splits, TQString& categoryId, const char* splitEditSlot, bool allowObjectCreation = true); /** * This method sets the precision of the value widgets to reflect @@ -179,7 +180,7 @@ protected: protected slots: virtual void slotUpdateButtonState(void); virtual void slotUpdateAccount(void); - virtual void slotNumberChanged(const QString&); + virtual void slotNumberChanged(const TQString&); signals: /** @@ -207,17 +208,17 @@ signals: * @param txt The name of the payee to be created * @param id A connected slot should store the id of the created object in this variable */ - void createPayee(const QString& txt, QString& id); + void createPayee(const TQString& txt, TQString& id); /** * This signal is sent out, when a new category needs to be created - * Depending on the setting of either a payment or deposit, the parent + * Depending on the setting of either a payment or deposit, the tqparent * account will be preset to Expense or Income. * * @param account reference to account info. Will be filled by called slot - * @param parent reference to parent account + * @param tqparent reference to tqparent account */ - void createCategory(MyMoneyAccount& account, const MyMoneyAccount& parent); + void createCategory(MyMoneyAccount& account, const MyMoneyAccount& tqparent); /** * This signal is sent out, when a new security (e.g. stock )needs to be created @@ -225,9 +226,9 @@ signals: * will be created. * * @param account reference to account info. Will be filled by called slot - * @param parent reference to parent account + * @param tqparent reference to tqparent account */ - void createSecurity(MyMoneyAccount& account, const MyMoneyAccount& parent); + void createSecurity(MyMoneyAccount& account, const MyMoneyAccount& tqparent); /** * Signal is emitted, if any of the widgets enters (@a state equals @a true) @@ -237,7 +238,7 @@ signals: */ void objectCreation(bool state); - void statusMsg(const QString& txt); + void statusMsg(const TQString& txt); void statusProgress(int cnt, int base); @@ -246,7 +247,7 @@ signals: * * @param date the post date of the newly created transaction */ - void lastPostDateUsed(const QDate& date); + void lastPostDateUsed(const TQDate& date); /** * This signal is sent out, if the user decides to schedule the transaction @a t @@ -273,22 +274,22 @@ signals: /** * This signal is sent out, if any of the balance warning levels * for @p account has been reached. @p msg contains the message text. - * @p parent points to the parent widget to be used for the warning message box. + * @p tqparent points to the tqparent widget to be used for the warning message box. */ - void balanceWarning(QWidget* parent, const MyMoneyAccount& account, const QString& msg); + void balanceWarning(TQWidget* tqparent, const MyMoneyAccount& account, const TQString& msg); protected: - QValueList<MyMoneySplit> m_splits; + TQValueList<MyMoneySplit> m_splits; KMyMoneyRegister::SelectedTransactions m_transactions; - QValueList<const QWidget*> m_finalEditWidgets; + TQValueList<const TQWidget*> m_finalEditWidgets; TransactionEditorContainer* m_regForm; KMyMoneyRegister::Transaction* m_item; - KMyMoneyRegister::QWidgetContainer m_editWidgets; + KMyMoneyRegister::TQWidgetContainer m_editWidgets; MyMoneyAccount m_account; MyMoneyTransaction m_transaction; MyMoneySplit m_split; - QDate m_lastPostDate; - QMap<QString, MyMoneyMoney> m_priceInfo; + TQDate m_lastPostDate; + TQMap<TQString, MyMoneyMoney> m_priceInfo; KMyMoneyRegister::Action m_initialAction; bool m_openEditSplits; }; @@ -297,15 +298,16 @@ protected: class StdTransactionEditor : public TransactionEditor { Q_OBJECT + TQ_OBJECT public: StdTransactionEditor(); - StdTransactionEditor(TransactionEditorContainer* regForm, KMyMoneyRegister::Transaction* item, const KMyMoneyRegister::SelectedTransactions& list, const QDate& lastPostDate); + StdTransactionEditor(TransactionEditorContainer* regForm, KMyMoneyRegister::Transaction* item, const KMyMoneyRegister::SelectedTransactions& list, const TQDate& lastPostDate); ~StdTransactionEditor(); - bool isComplete(QString& reason) const; - QWidget* firstWidget(void) const; + bool isComplete(TQString& reason) const; + TQWidget* firstWidget(void) const; - bool eventFilter(QObject* o, QEvent* e); + bool eventFilter(TQObject* o, TQEvent* e); /** * This method creates a transaction based on the contents of the current widgets, @@ -329,18 +331,18 @@ public: public slots: int slotEditSplits(void); - void slotUpdateAmount(const QString&); + void slotUpdateAmount(const TQString&); protected slots: void slotReloadEditWidgets(void); - void slotUpdatePayment(const QString&); - void slotUpdateDeposit(const QString&); - void slotUpdateCategory(const QString&); - void slotUpdatePayee(const QString&); + void slotUpdatePayment(const TQString&); + void slotUpdateDeposit(const TQString&); + void slotUpdateCategory(const TQString&); + void slotUpdatePayee(const TQString&); void slotUpdateCashFlow(KMyMoneyRegister::CashFlowDirection); - void slotCreateCategory(const QString&, QString&); + void slotCreateCategory(const TQString&, TQString&); void slotUpdateAction(int action); - void slotUpdateAccount(const QString& id); + void slotUpdateAccount(const TQString& id); protected: /** @@ -358,17 +360,17 @@ protected: */ void loadEditWidgets(KMyMoneyRegister::Action action = KMyMoneyRegister::ActionNone); - void setupCategoryWidget(QString&); + void setupCategoryWidget(TQString&); void updateAmount(const MyMoneyMoney& value); - bool isTransfer(const QString& accId1, const QString& accId2) const; + bool isTransfer(const TQString& accId1, const TQString& accId2) const; - void checkPayeeInSplit(MyMoneySplit& s, const QString& payeeId); + void checkPayeeInSplit(MyMoneySplit& s, const TQString& payeeId); /** * This method fills the editor widgets with the last transaction * that can be found for payee @a payeeId in the account @a m_account. */ - void autoFill(const QString& payeeId); + void autoFill(const TQString& payeeId); /** * Extracts the amount of the transaction from the widgets depending diff --git a/kmymoney2/dialogs/transactionmatcher.cpp b/kmymoney2/dialogs/transactionmatcher.cpp index 5b8d4b5..2ed5356 100644 --- a/kmymoney2/dialogs/transactionmatcher.cpp +++ b/kmymoney2/dialogs/transactionmatcher.cpp @@ -80,38 +80,38 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr // verify that the amounts are the same, otherwise we should not be matching! if(sm.shares() != si.shares()) { - throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").arg(m_account.name()).arg(sm.shares().formatMoney(m_account, sec), si.shares().formatMoney(m_account, sec))); + throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").tqarg(m_account.name()).tqarg(sm.shares().formatMoney(m_account, sec), si.shares().formatMoney(m_account, sec))); } // ipwizard: I took over the code to keep the bank id found in the endMatchTransaction - // This might not work for QIF imports as they don't setup this information. It sure + // This might not work for TQIF imports as they don't setup this information. It sure // makes sense for OFX and HBCI. - const QString& bankID = si.bankID(); + const TQString& bankID = si.bankID(); if (!bankID.isEmpty()) { try { if (sm.bankID().isEmpty() ) { sm.setBankID( bankID ); tm.modifySplit(sm); } else if(sm.bankID() != bankID) { - throw new MYMONEYEXCEPTION(i18n("Both of these transactions have been imported into %1. Therefore they cannot be matched. Matching works with one imported transaction and one non-imported transaction.").arg(m_account.name())); + throw new MYMONEYEXCEPTION(i18n("Both of these transactions have been imported into %1. Therefore they cannot be matched. Matching works with one imported transaction and one non-imported transaction.").tqarg(m_account.name())); } } catch(MyMoneyException *e) { - QString estr = e->what(); + TQString estr = e->what(); delete e; - throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").arg(estr)); + throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").tqarg(estr)); } } #if 0 // Ace's original code // TODO (Ace) Add in another error to catch the case where a user // tries to match two hand-entered transactions. - QValueList<MyMoneySplit> endSplits = endMatchTransaction.splits(); - QValueList<MyMoneySplit>::const_iterator it_split = endSplits.begin(); + TQValueList<MyMoneySplit> endSplits = endMatchTransaction.splits(); + TQValueList<MyMoneySplit>::const_iterator it_split = endSplits.begin(); while (it_split != endSplits.end()) { // find the corresponding split in the start transaction MyMoneySplit startSplit; - QString accountid = (*it_split).accountId(); + TQString accountid = (*it_split).accountId(); try { startSplit = startMatchTransaction.splitByAccount( accountid ); @@ -129,11 +129,11 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr // matching! if ( (*it_split).value() != startSplit.value() ) { - QString accountname = MyMoneyFile::instance()->account(accountid).name(); - throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").arg(accountname).arg((*it_split).value().formatMoney(),startSplit.value().formatMoney())); + TQString accountname = MyMoneyFile::instance()->account(accountid).name(); + throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").tqarg(accountname).tqarg((*it_split).value().formatMoney(),startSplit.value().formatMoney())); } - QString bankID = (*it_split).bankID(); + TQString bankID = (*it_split).bankID(); if ( ! bankID.isEmpty() ) { try @@ -145,15 +145,15 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr } else { - QString accountname = MyMoneyFile::instance()->account(accountid).name(); - throw new MYMONEYEXCEPTION(i18n("Both of these transactions have been imported into %1. Therefore they cannot be matched. Matching works with one imported transaction and one non-imported transaction.").arg(accountname)); + TQString accountname = MyMoneyFile::instance()->account(accountid).name(); + throw new MYMONEYEXCEPTION(i18n("Both of these transactions have been imported into %1. Therefore they cannot be matched. Matching works with one imported transaction and one non-imported transaction.").tqarg(accountname)); } } catch(MyMoneyException *e) { - QString estr = e->what(); + TQString estr = e->what(); delete e; - throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").arg(estr)); + throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").tqarg(estr)); } } ++it_split; @@ -179,7 +179,7 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr } // combine the two memos into one - QString memo = sm.memo(); + TQString memo = sm.memo(); if(!si.memo().isEmpty() && si.memo() != memo) { sm.setValue("kmm-orig-memo", memo); if(!memo.isEmpty()) @@ -217,7 +217,7 @@ void TransactionMatcher::unmatch(const MyMoneyTransaction& _t, const MyMoneySpli // restore the postdate if modified if(!sm.value("kmm-orig-postdate").isEmpty()) { - tm.setPostDate(QDate::fromString(sm.value("kmm-orig-postdate"), Qt::ISODate)); + tm.setPostDate(TQDate::fromString(sm.value("kmm-orig-postdate"), Qt::ISODate)); } // restore payee if modified @@ -257,13 +257,13 @@ void TransactionMatcher::accept(const MyMoneyTransaction& _t, const MyMoneySplit } } -void TransactionMatcher::checkTransaction(const MyMoneyTransaction& tm, const MyMoneyTransaction& ti, const MyMoneySplit& si, QPair<MyMoneyTransaction, MyMoneySplit>& lastMatch, TransactionMatcher::autoMatchResultE& result, int variation) const +void TransactionMatcher::checkTransaction(const MyMoneyTransaction& tm, const MyMoneyTransaction& ti, const MyMoneySplit& si, TQPair<MyMoneyTransaction, MyMoneySplit>& lastMatch, TransactionMatcher::autoMatchResultE& result, int variation) const { Q_UNUSED(ti); - const QValueList<MyMoneySplit>& splits = tm.splits(); - QValueList<MyMoneySplit>::const_iterator it_s; + const TQValueList<MyMoneySplit>& splits = tm.splits(); + TQValueList<MyMoneySplit>::const_iterator it_s; for(it_s = splits.begin(); it_s != splits.end(); ++it_s) { MyMoneyMoney upper((*it_s).shares()); MyMoneyMoney lower(upper); @@ -277,7 +277,7 @@ void TransactionMatcher::checkTransaction(const MyMoneyTransaction& tm, const My // check for duplicate (we can only do that, if we have a bankID) if(!si.bankID().isEmpty()) { if((*it_s).bankID() == si.bankID()) { - lastMatch = QPair<MyMoneyTransaction, MyMoneySplit>(tm, *it_s); + lastMatch = TQPair<MyMoneyTransaction, MyMoneySplit>(tm, *it_s); result = matchedDuplicate; break; } @@ -292,10 +292,10 @@ void TransactionMatcher::checkTransaction(const MyMoneyTransaction& tm, const My && (si.shares() >= lower) && (si.shares() <= upper) && !(*it_s).isMatched()) { if(tm.postDate() == ti.postDate()) { - lastMatch = QPair<MyMoneyTransaction, MyMoneySplit>(tm, *it_s); + lastMatch = TQPair<MyMoneyTransaction, MyMoneySplit>(tm, *it_s); result = matchedExact; } else if(result != matchedExact) { - lastMatch = QPair<MyMoneyTransaction, MyMoneySplit>(tm, *it_s); + lastMatch = TQPair<MyMoneyTransaction, MyMoneySplit>(tm, *it_s); result = matched; } } @@ -313,12 +313,12 @@ MyMoneyObject const * TransactionMatcher::findMatch(const MyMoneyTransaction& ti filter.setDateFilter(ti.postDate().addDays(-m_days), ti.postDate().addDays(m_days)); filter.setAmountFilter(si.shares(), si.shares()); - QValueList<QPair<MyMoneyTransaction, MyMoneySplit> > list; + TQValueList<TQPair<MyMoneyTransaction, MyMoneySplit> > list; MyMoneyFile::instance()->transactionList(list, filter); // parse list - QValueList<QPair<MyMoneyTransaction, MyMoneySplit> >::iterator it_l; - QPair<MyMoneyTransaction, MyMoneySplit> lastMatch; + TQValueList<TQPair<MyMoneyTransaction, MyMoneySplit> >::iterator it_l; + TQPair<MyMoneyTransaction, MyMoneySplit> lastMatch; for(it_l = list.begin(); (result != matchedDuplicate) && (it_l != list.end()); ++it_l) { // just skip myself @@ -336,13 +336,13 @@ MyMoneyObject const * TransactionMatcher::findMatch(const MyMoneyTransaction& ti } else { // if we did not find anything, we need to scan for scheduled transactions - QValueList<MyMoneySchedule> list; - QValueList<MyMoneySchedule>::iterator it_sch; + TQValueList<MyMoneySchedule> list; + TQValueList<MyMoneySchedule>::iterator it_sch; // find all schedules that have a reference to the current account list = MyMoneyFile::instance()->scheduleList(m_account.id()); for(it_sch = list.begin(); (result != matched && result != matchedExact) && (it_sch != list.end()); ++it_sch) { // get the next due date adjusted by the weekend switch - QDate nextDueDate = (*it_sch).nextDueDate(); + TQDate nextDueDate = (*it_sch).nextDueDate(); if((*it_sch).isOverdue() || (nextDueDate >= ti.postDate().addDays(-m_days) && nextDueDate <= ti.postDate().addDays(m_days))) { diff --git a/kmymoney2/dialogs/transactionmatcher.h b/kmymoney2/dialogs/transactionmatcher.h index e5e036c..3295da1 100644 --- a/kmymoney2/dialogs/transactionmatcher.h +++ b/kmymoney2/dialogs/transactionmatcher.h @@ -134,7 +134,7 @@ public: void setMatchWindow(int days) { m_days = days; } private: - void checkTransaction(const MyMoneyTransaction& tm, const MyMoneyTransaction& ti, const MyMoneySplit& si, QPair<MyMoneyTransaction, MyMoneySplit>& lastMatch, autoMatchResultE& result, int variation = 0) const; + void checkTransaction(const MyMoneyTransaction& tm, const MyMoneyTransaction& ti, const MyMoneySplit& si, TQPair<MyMoneyTransaction, MyMoneySplit>& lastMatch, autoMatchResultE& result, int variation = 0) const; private: MyMoneyAccount m_account; |