Replace Qt with TQt

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

developer-doc/phb/src-examples.docbook

@@ -241,13 +241,13 @@ void KSettingsDlg::setPageGeneral()
   // Create a group box to hold the available options
   QButtonGroup *qbuttongroup = new QButtonGroup(qvboxMainFrame, "GroupBox1");
   qbuttongroup->setTitle( i18n( "Startup options" ) );
-  qbuttongroup->setColumnLayout(0, Qt::Vertical );
+  qbuttongroup->setColumnLayout(0, TQt::Vertical );
   qbuttongroup->layout()->setSpacing( 0 );
   qbuttongroup->layout()->setMargin( 0 );
 
   // Create a layout to organize the widgets.
   QVBoxLayout *qvboxlayout = new QVBoxLayout(qbuttongroup->layout());
-  qvboxlayout->setAlignment( Qt::AlignTop );
+  qvboxlayout->setAlignment( TQt::AlignTop );
   qvboxlayout->setSpacing( 6 );
   qvboxlayout->setMargin( 11 );
 
@@ -308,13 +308,13 @@ void KSettingsDlg::setPageList()
   // Create a group to hold two radio buttons
   QButtonGroup *qbuttongroup = new QButtonGroup(qwidgetPage, "ButtonGroup1");
   qbuttongroup->setTitle(i18n("Row Colour options"));
-  qbuttongroup->setColumnLayout(0, Qt::Vertical );
+  qbuttongroup->setColumnLayout(0, TQt::Vertical );
   qbuttongroup->layout()->setSpacing( 0 );
   qbuttongroup->layout()->setMargin( 0 );
 
   // Create a layout
   QVBoxLayout *qvboxlayout = new QVBoxLayout(qbuttongroup->layout());
-  qvboxlayout->setAlignment( Qt::AlignTop );
+  qvboxlayout->setAlignment( TQt::AlignTop );
   qvboxlayout->setSpacing( 6 );
   qvboxlayout->setMargin( 11 );
 
@@ -416,8 +416,8 @@ void KSettingsDlg::configRead()
   tdeconfig->setGroup("List Options");
 
   QFont qfontDefault = QFont("helvetica", 12);
-  TQColor qcolorDefault = Qt::white;
-  TQColor qcolorDefaultBG = Qt::gray;
+  TQColor qcolorDefault = TQt::white;
+  TQColor qcolorDefaultBG = TQt::gray;
 
   m_qcolorTempList = tdeconfig->readColorEntry("listColor", &qcolorDefault);
   m_kcolorbuttonList->setColor(m_qcolorTempList);

kmymoney2/converter/mymoneygncreader.cpp

@@ -1429,7 +1429,7 @@ void MyMoneyGncReader::convertSplit (const GncSplit *gsp) {
   MyMoneyMoney splitValue (convBadValue (gsp->value()));
   if (gsp->value() == "-1/0") { // treat gnc invalid value as zero
    // it's not quite a consistency check, but easier to treat it as such
-   postMessage ("CC", 4, splitAccount.name().latin1(), TQString(m_txDatePosted.toString(Qt::ISODate)).latin1());
+   postMessage ("CC", 4, splitAccount.name().latin1(), TQString(m_txDatePosted.toString(TQt::ISODate)).latin1());
   }
   MyMoneyMoney splitQuantity(convBadValue(gsp->qty()));
   split.setValue (splitValue);
@@ -1470,7 +1470,7 @@ void MyMoneyGncReader::convertSplit (const GncSplit *gsp) {
           e.setTradingCurrency (m_txCommodity);
           if (gncdebug) tqDebug(TQString("added price for %1, %2 date %3").
               arg(e.name()).arg(newPrice.toString()).
-              arg(m_txDatePosted.toString(Qt::ISODate)));
+              arg(m_txDatePosted.toString(TQt::ISODate)));
           m_storage->modifySecurity(e);
           MyMoneyPrice dealPrice (e.id(), m_txCommodity, m_txDatePosted, newPrice, i18n("Imported Transaction"));
           m_storage->addPrice (dealPrice);
@@ -1788,7 +1788,7 @@ void MyMoneyGncReader::convertSchedule (const GncSchedule *gsc) {
     } else {
       const GncRecurrence *gre = gsc->m_vpRecurrence.first();
       //tqDebug (TQString("Sched %1, pt %2, mu %3, sd %4").arg(gsc->name()).arg(gre->periodType())
-       // .arg(gre->mult()).arg(gre->startDate().toString(Qt::ISODate)));
+       // .arg(gre->mult()).arg(gre->startDate().toString(TQt::ISODate)));
       frequency = gre->getFrequency();
       schedEnabled = gsc->enabled();
     }

kmymoney2/converter/mymoneygncreader.h

@@ -305,7 +305,7 @@ protected:
   friend class GncSplit;
   friend class GncSchedule;
   friend class GncRecurrence;
-  const TQDate date() const { return (TQDate::fromString(m_v.at(TSDATE)->section(' ', 0, 0), Qt::ISODate));};
+  const TQDate date() const { return (TQDate::fromString(m_v.at(TSDATE)->section(' ', 0, 0), TQt::ISODate));};
 private:
   // data elements
   enum DateDataEls {TSDATE, GDATE, END_Date_DELS};

kmymoney2/converter/mymoneyqifreader.cpp

@@ -1017,7 +1017,7 @@ void MyMoneyQifReader::processTransactionEntry(void)
   h = MyMoneyTransaction::hash(m_qifEntry.join(";"));
 
   TQString hashBase;
-  hashBase.sprintf("%s-%07lx", m_qifProfile.date(extractLine('D')).toString(Qt::ISODate).latin1(), h);
+  hashBase.sprintf("%s-%07lx", m_qifProfile.date(extractLine('D')).toString(TQt::ISODate).latin1(), h);
   int idx = 1;
   TQString hash;
   for(;;) {
@@ -1327,7 +1327,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void)
   h = MyMoneyTransaction::hash(m_qifEntry.join(";"));
 
   TQString hashBase;
-  hashBase.sprintf("%s-%07lx", m_qifProfile.date(extractLine('D')).toString(Qt::ISODate).latin1(), h);
+  hashBase.sprintf("%s-%07lx", m_qifProfile.date(extractLine('D')).toString(TQt::ISODate).latin1(), h);
   int idx = 1;
   TQString hash;
   for(;;) {

kmymoney2/converter/mymoneystatementreader.cpp

@@ -277,11 +277,11 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes
 
   // see if we need to update some values stored with the account
   if(m_account.value("lastStatementBalance") != s.m_closingBalance.toString()
-  || m_account.value("lastImportedTransactionDate") != s.m_dateEnd.toString(Qt::ISODate)) {
+  || m_account.value("lastImportedTransactionDate") != s.m_dateEnd.toString(TQt::ISODate)) {
     if(s.m_closingBalance != MyMoneyMoney::autoCalc) {
       m_account.setValue("lastStatementBalance", s.m_closingBalance.toString());
       if ( s.m_dateEnd.isValid() ) {
-        m_account.setValue("lastImportedTransactionDate", s.m_dateEnd.toString(Qt::ISODate));
+        m_account.setValue("lastImportedTransactionDate", s.m_dateEnd.toString(TQt::ISODate));
       }
     }
 
@@ -393,7 +393,7 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes
   if(s.m_closingBalance.isAutoCalc()) {
     messages += i18n("  Statement balance is not contained in statement.");
   } else {
-    messages += i18n("  Statement balance on %1 is reported to be %2").arg(s.m_dateEnd.toString(Qt::ISODate)).arg(s.m_closingBalance.formatMoney("",2));
+    messages += i18n("  Statement balance on %1 is reported to be %2").arg(s.m_dateEnd.toString(TQt::ISODate)).arg(s.m_closingBalance.formatMoney("",2));
   }
   messages += i18n("  Transactions");
   messages += i18n("    %1 processed").arg(d->transactionsCount);
@@ -504,7 +504,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
 
 #if 0
   TQString dbgMsg;
-  dbgMsg = TQString("Process %1, '%3', %2").arg(t_in.m_datePosted.toString(Qt::ISODate)).arg(t_in.m_amount.formatMoney("", 2)).arg(t_in.m_strBankID);
+  dbgMsg = TQString("Process %1, '%3', %2").arg(t_in.m_datePosted.toString(TQt::ISODate)).arg(t_in.m_amount.formatMoney("", 2)).arg(t_in.m_strBankID);
   tqDebug(dbgMsg);
 #endif
 

kmymoney2/dialogs/kbalancechartdlg.cpp

@@ -98,7 +98,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare
 
   // draw future values in a different line style
   KDChartPropertySet propSetFutureValue("future value", KMM_KDCHART_PROPSET_NORMAL_DATA);
-  propSetFutureValue.setLineStyle(KDChartPropertySet::OwnID, Qt::DotLine);
+  propSetFutureValue.setLineStyle(KDChartPropertySet::OwnID, TQt::DotLine);
   int m_idPropFutureValue = chartWidget->params()->registerProperties(propSetFutureValue);
 
   KDChartPropertySet propSetLastValue("last value", m_idPropFutureValue);
@@ -109,13 +109,13 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare
   int m_idPropLastValue = chartWidget->params()->registerProperties(propSetLastValue);
 
   KDChartPropertySet propSetMinBalance("min balance", m_idPropFutureValue);
-  propSetMinBalance.setLineStyle(KDChartPropertySet::OwnID, Qt::NoPen);
+  propSetMinBalance.setLineStyle(KDChartPropertySet::OwnID, TQt::NoPen);
   propSetMinBalance.setExtraLinesAlign(KDChartPropertySet::OwnID, TQt::AlignLeft | TQt::AlignRight);
   int m_idPropMinBalance = chartWidget->params()->registerProperties(propSetMinBalance);
 
   KDChartPropertySet propSetMaxCredit("max credit", m_idPropMinBalance);
   propSetMaxCredit.setExtraLinesColor(KDChartPropertySet::OwnID, KMyMoneyGlobalSettings::listNegativeValueColor());
-  propSetMaxCredit.setExtraLinesStyle(KDChartPropertySet::OwnID, Qt::DotLine);
+  propSetMaxCredit.setExtraLinesStyle(KDChartPropertySet::OwnID, TQt::DotLine);
   int m_idPropMaxCredit = chartWidget->params()->registerProperties(propSetMaxCredit);
 
   KBalanceChartDlgLayout->addWidget(chartWidget, 10);

kmymoney2/dialogs/kendingbalancedlg.cpp

@@ -121,7 +121,7 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *pa
 
   value = account.value("statementDate");
   if(!value.isEmpty())
-    m_statementDate->setDate(TQDate::fromString(value, Qt::ISODate));
+    m_statementDate->setDate(TQDate::fromString(value, TQt::ISODate));
 
   m_lastStatementDate->setText(TQString());
   if(account.lastReconciliationDate().isValid()) {
@@ -205,18 +205,18 @@ void KEndingBalanceDlg::slotUpdateBalances(void)
     const MyMoneySplit& split = (*it).second;
     balance -= split.shares() * factor;
     if((*it).first.postDate() > m_statementDate->date()) {
-      tracer.printf("Reducing balances by %s because postdate of %s/%s(%s) is past statement date", (split.shares() * factor).formatMoney("", 2).local8Bit().data(), (*it).first.id().local8Bit().data(),split.id().local8Bit().data(), (*it).first.postDate().toString(Qt::ISODate).local8Bit().data());
+      tracer.printf("Reducing balances by %s because postdate of %s/%s(%s) is past statement date", (split.shares() * factor).formatMoney("", 2).local8Bit().data(), (*it).first.id().local8Bit().data(),split.id().local8Bit().data(), (*it).first.postDate().toString(TQt::ISODate).local8Bit().data());
       endBalance -= split.shares() * factor;
       startBalance -= split.shares() * factor;
     } else {
       switch(split.reconcileFlag()) {
         case MyMoneySplit::NotReconciled:
-          tracer.printf("Reducing balances by %s because %s/%s(%s) is not reconciled", (split.shares() * factor).formatMoney("", 2).local8Bit().data(), (*it).first.id().local8Bit().data(), split.id().local8Bit().data(), (*it).first.postDate().toString(Qt::ISODate).local8Bit().data());
+          tracer.printf("Reducing balances by %s because %s/%s(%s) is not reconciled", (split.shares() * factor).formatMoney("", 2).local8Bit().data(), (*it).first.id().local8Bit().data(), split.id().local8Bit().data(), (*it).first.postDate().toString(TQt::ISODate).local8Bit().data());
           endBalance -= split.shares() * factor;
           startBalance -= split.shares() * factor;
           break;
         case MyMoneySplit::Cleared:
-          tracer.printf("Reducing start balance by %s because %s/%s(%s) is cleared", (split.shares() * factor).formatMoney("", 2).local8Bit().data(), (*it).first.id().local8Bit().data(), split.id().local8Bit().data(), (*it).first.postDate().toString(Qt::ISODate).local8Bit().data());
+          tracer.printf("Reducing start balance by %s because %s/%s(%s) is cleared", (split.shares() * factor).formatMoney("", 2).local8Bit().data(), (*it).first.id().local8Bit().data(), split.id().local8Bit().data(), (*it).first.postDate().toString(TQt::ISODate).local8Bit().data());
           startBalance -= split.shares() * factor;
           break;
         default:

kmymoney2/dialogs/kequitypriceupdatedlg.cpp

@@ -226,7 +226,7 @@ void KEquityPriceUpdateDlg::addPricePair(const MyMoneySecurityPair& pair, bool d
           i18n("%1 units in %2").arg(pair.first,pair.second));
         if(pr.isValid()) {
           item->setText(PRICE_COL, pr.rate(pair.second).formatMoney(file->currency(pair.second).tradingSymbol(), KMyMoneyGlobalSettings::pricePrecision()));
-          item->setText(DATE_COL, pr.date().toString(Qt::ISODate));
+          item->setText(DATE_COL, pr.date().toString(TQt::ISODate));
         }
         item->setText(ID_COL,id);
         item->setText(SOURCE_COL, "Yahoo Currency");  // This string value should not be localized
@@ -260,7 +260,7 @@ void KEquityPriceUpdateDlg::addInvestment(const MyMoneySecurity& inv)
       MyMoneyPrice pr = file->price(id.utf8(), inv.tradingCurrency());
       if(pr.isValid()) {
         item->setText(PRICE_COL, pr.rate(currency.id()).formatMoney(currency.tradingSymbol(), KMyMoneyGlobalSettings::pricePrecision()));
-        item->setText(DATE_COL, pr.date().toString(Qt::ISODate));
+        item->setText(DATE_COL, pr.date().toString(TQt::ISODate));
       }
       item->setText(ID_COL,id);
       if (inv.value("kmm-online-quote-system") == "Finance::Quote")
@@ -306,13 +306,13 @@ MyMoneyPrice KEquityPriceUpdateDlg::price(const TQString& id) const
         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));
+        price = MyMoneyPrice(fromid,toid,TQDate().fromString(item->text(DATE_COL), TQt::ISODate),rate,item->text(SOURCE_COL));
       }
       else
       // otherwise, it's a security quote
       {
         MyMoneySecurity security = MyMoneyFile::instance()->security(id);
-        price = MyMoneyPrice(id, security.tradingCurrency(), TQDate().fromString(item->text(DATE_COL), Qt::ISODate), rate, item->text(SOURCE_COL));
+        price = MyMoneyPrice(id, security.tradingCurrency(), TQDate().fromString(item->text(DATE_COL), TQt::ISODate), rate, item->text(SOURCE_COL));
       }
     }
   }
@@ -347,7 +347,7 @@ void KEquityPriceUpdateDlg::storePrices(void)
           TQString fromid = ids[0].utf8();
           TQString toid = ids[1].utf8();
           name = TQString("%1 --> %2").arg(fromid).arg(toid);
-          MyMoneyPrice price(fromid,toid,TQDate().fromString(item->text(DATE_COL), Qt::ISODate),rate,item->text(SOURCE_COL));
+          MyMoneyPrice price(fromid,toid,TQDate().fromString(item->text(DATE_COL), TQt::ISODate),rate,item->text(SOURCE_COL));
           file->addPrice(price);
         }
         else
@@ -355,7 +355,7 @@ void KEquityPriceUpdateDlg::storePrices(void)
         {
           MyMoneySecurity security = MyMoneyFile::instance()->security(id);
           name = security.name();
-          MyMoneyPrice price(id, security.tradingCurrency(), TQDate().fromString(item->text(DATE_COL), Qt::ISODate), rate, item->text(SOURCE_COL));
+          MyMoneyPrice price(id, security.tradingCurrency(), TQDate().fromString(item->text(DATE_COL), TQt::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
@@ -528,7 +528,7 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQStrin
         }
       }
       item->setText(PRICE_COL, TDEGlobal::locale()->formatMoney(price, sec.tradingSymbol(), KMyMoneyGlobalSettings::pricePrecision()));
-      item->setText(DATE_COL, date.toString(Qt::ISODate));
+      item->setText(DATE_COL, date.toString(TQt::ISODate));
       logStatusMessage(i18n("Price for %1 updated (id %2)").arg(_symbol,_id));
       // make sure to make OK button available
       btnOK->setEnabled(true);

kmymoney2/dialogs/kmymoneyfileinfodlg.cpp

@@ -48,8 +48,8 @@ KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(TQWidget *parent, const char *name )
   // Now fill the fields with data
   IMyMoneyStorage* storage = MyMoneyFile::instance()->storage();
 
-  m_creationDate->setText(storage->creationDate().toString(Qt::ISODate));
-  m_lastModificationDate->setText(storage->lastModificationDate().toString(Qt::ISODate));
+  m_creationDate->setText(storage->creationDate().toString(TQt::ISODate));
+  m_lastModificationDate->setText(storage->lastModificationDate().toString(TQt::ISODate));
   m_baseCurrency->setText(storage->value("kmm-baseCurrency"));
 
   m_payeeCount->setText(TQString("%1").arg(storage->payeeList().count()));

kmymoney2/dialogs/kmymoneysplittable.cpp

@@ -397,7 +397,7 @@ void kMyMoneySplitTable::slotSetFocus(int realrow, int /* col */, int button, co
   // make sure the row will be on the screen
   ensureCellVisible(row, 0);
 
-  if(button == Qt::LeftButton) {          // left mouse button
+  if(button == TQt::LeftButton) {          // left mouse button
     if(isEditMode()) {                    // in edit mode?
       if(KMyMoneyGlobalSettings::focusChangeIsEnter())
         slotEndEdit();
@@ -409,7 +409,7 @@ void kMyMoneySplitTable::slotSetFocus(int realrow, int /* col */, int button, co
       setCurrentCell(row, 0);
       slotUpdateData(m_transaction);
     }
-  } else if(button == Qt::RightButton) {
+  } else if(button == TQt::RightButton) {
     // context menu is only available when cursor is on
     // an existing transaction or the first line after this area
     if(row == realrow) {

kmymoney2/dialogs/kmymoneysplittable.h

@@ -152,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 TQPoint & mousePos = TQPoint(0, 0));
+  void slotSetFocus(int row, int col = 0, int button = TQt::LeftButton, const TQPoint & mousePos = TQPoint(0, 0));
 
   /**
     * Calling this slot refills the widget with the data

kmymoney2/dialogs/transactionmatcher.cpp

@@ -178,7 +178,7 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr
 
   // We use the imported postdate and keep the previous one for unmatch
   if(tm.postDate() != ti.postDate()) {
-    sm.setValue("kmm-orig-postdate", tm.postDate().toString(Qt::ISODate));
+    sm.setValue("kmm-orig-postdate", tm.postDate().toString(TQt::ISODate));
     tm.setPostDate(ti.postDate());
   }
 
@@ -221,7 +221,7 @@ void TransactionMatcher::unmatch(const MyMoneyTransaction& _t, const MyMoneySpli
 
     // restore the postdate if modified
     if(!sm.value("kmm-orig-postdate").isEmpty()) {
-      tm.setPostDate(TQDate::fromString(sm.value("kmm-orig-postdate"), Qt::ISODate));
+      tm.setPostDate(TQDate::fromString(sm.value("kmm-orig-postdate"), TQt::ISODate));
     }
 
     // restore payee if modified

kmymoney2/kmymoney2.cpp

@@ -2355,7 +2355,7 @@ void KMyMoney2App::createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& par
       b.setShares(b.value());
       a.setMemo(i18n("Loan payout"));
       b.setMemo(i18n("Loan payout"));
-      t.setPostDate(TQDate::fromString(acc.value("kmm-loan-payment-date"), Qt::ISODate));
+      t.setPostDate(TQDate::fromString(acc.value("kmm-loan-payment-date"), TQt::ISODate));
       newAccount.deletePair("kmm-loan-payment-acc");
       newAccount.deletePair("kmm-loan-payment-date");
       MyMoneyFile::instance()->modifyAccount(newAccount);
@@ -3278,7 +3278,7 @@ void KMyMoney2App::slotAccountReconcilePostpone(void)
 
     m_reconciliationAccount.setValue("lastReconciledBalance", m_endingBalanceDlg->previousBalance().toString());
     m_reconciliationAccount.setValue("statementBalance", m_endingBalanceDlg->endingBalance().toString());
-    m_reconciliationAccount.setValue("statementDate", m_endingBalanceDlg->statementDate().toString(Qt::ISODate));
+    m_reconciliationAccount.setValue("statementDate", m_endingBalanceDlg->statementDate().toString(TQt::ISODate));
 
     try {
       file->modifyAccount(m_reconciliationAccount);
@@ -4095,7 +4095,7 @@ void KMyMoney2App::slotCurrencySetBase(void)
 
 void KMyMoney2App::slotBudgetNew(void)
 {
-  TQDate date = TQDate::currentDate(Qt::LocalTime);
+  TQDate date = TQDate::currentDate(TQt::LocalTime);
   date.setYMD(date.year(), 1, 1);
   TQString newname = i18n("Budget %1").arg(TQString::number(date.year()));
 

kmymoney2/kmymoney2.kcfg

@@ -209,7 +209,7 @@
   </entry>
   <entry name="StartDate" type="DateTime">
    <label>Start date</label>
-   <default>TQDateTime::fromString("1900-01-01T00:00:00", Qt::ISODate)</default>
+   <default>TQDateTime::fromString("1900-01-01T00:00:00", TQt::ISODate)</default>
   </entry>
   <entry name="useSystemColors" type="Bool">
    <label>Use system colors</label>

kmymoney2/mymoney/mymoneyaccount.cpp

@@ -82,7 +82,7 @@ MyMoneyAccount::MyMoneyAccount(const TQDomElement& node) :
     // to be ok for now. (ipwizard - 2008-08-14)
     TQString txt = MyMoneyKeyValueContainer(node.elementsByTagName("KEYVALUEPAIRS").item(0).toElement()).value("lastStatementDate");
     if(!txt.isEmpty()) {
-      setLastReconciliationDate(TQDate::fromString(txt, Qt::ISODate));
+      setLastReconciliationDate(TQDate::fromString(txt, TQt::ISODate));
     }
   }
 
@@ -168,7 +168,7 @@ void MyMoneyAccount::setLastReconciliationDate(const TQDate& date)
   // keep the last reconciliation date also in the KVP for backward
   // compatability. After that, the setValue() statemetn should be removed
   // and the XML ctor should remove the value completely from the KVP
-  setValue("lastStatementDate", date.toString(Qt::ISODate));
+  setValue("lastStatementDate", date.toString(TQt::ISODate));
   m_lastReconciliationDate = date;
 }
 
@@ -360,7 +360,7 @@ const TQDate MyMoneyAccountLoan::nextInterestChange(void) const
 
 void MyMoneyAccountLoan::setNextInterestChange(const TQDate& date)
 {
-  setValue("interest-nextchange", date.toString(Qt::ISODate));
+  setValue("interest-nextchange", date.toString(TQt::ISODate));
 }
 
 int MyMoneyAccountLoan::interestChangeFrequency(int* unit) const

kmymoney2/mymoney/mymoneyaccounttest.cpp

@@ -313,7 +313,7 @@ void MyMoneyAccountTest::testWriteXML() {
 		"  </KEYVALUEPAIRS>\n"
 		" </ACCOUNT>\n"
 		"</ACCOUNT-CONTAINER>\n").
-			arg(TQDate::currentDate().toString(Qt::ISODate)).arg(TQDate::currentDate().toString(Qt::ISODate));
+			arg(TQDate::currentDate().toString(TQt::ISODate)).arg(TQDate::currentDate().toString(TQt::ISODate));
 
 	CPPUNIT_ASSERT(doc.toString() == ref);
 }
@@ -334,7 +334,7 @@ void MyMoneyAccountTest::testReadXML() {
 		"  </KEYVALUEPAIRS>\n"
 		" </ACCOUNT>\n"
 		"</ACCOUNT-CONTAINER>\n").
-			arg(TQDate::currentDate().toString(Qt::ISODate)).arg(TQDate::currentDate().toString(Qt::ISODate));
+			arg(TQDate::currentDate().toString(TQt::ISODate)).arg(TQDate::currentDate().toString(TQt::ISODate));
 
 	TQString ref_false = TQString(
 		"<!DOCTYPE TEST>\n"
@@ -350,7 +350,7 @@ void MyMoneyAccountTest::testReadXML() {
 		"  </KEYVALUEPAIRS>\n"
 		" </KACCOUNT>\n"
 		"</ACCOUNT-CONTAINER>\n").
-			arg(TQDate::currentDate().toString(Qt::ISODate)).arg(TQDate::currentDate().toString(Qt::ISODate));
+			arg(TQDate::currentDate().toString(TQt::ISODate)).arg(TQDate::currentDate().toString(TQt::ISODate));
 
 	TQDomDocument doc;
 	TQDomElement node;

kmymoney2/mymoney/mymoneybudget.cpp

@@ -198,7 +198,7 @@ void MyMoneyBudget::write(TQDomElement& e, TQDomDocument *doc) const
   writeBaseXML(*doc, e);
 
   e.setAttribute("name",  m_name);
-  e.setAttribute("start", m_start.toString(Qt::ISODate) );
+  e.setAttribute("start", m_start.toString(TQt::ISODate) );
   e.setAttribute("version", BUDGET_VERSION);
 
   TQMap<TQString, AccountGroup>::const_iterator it;
@@ -217,7 +217,7 @@ void MyMoneyBudget::write(TQDomElement& e, TQDomDocument *doc) const
           TQDomElement domPeriod = doc->createElement("PERIOD");
 
           domPeriod.setAttribute("amount", (*it_per).amount().toString());
-          domPeriod.setAttribute("start", (*it_per).startDate().toString(Qt::ISODate));
+          domPeriod.setAttribute("start", (*it_per).startDate().toString(TQt::ISODate));
           domAccount.appendChild(domPeriod);
         }
       }
@@ -240,7 +240,7 @@ bool MyMoneyBudget::read(const TQDomElement& e)
   {
     result = true;
     m_name  = e.attribute("name");
-    m_start = TQDate::fromString(e.attribute("start"), Qt::ISODate);
+    m_start = TQDate::fromString(e.attribute("start"), TQt::ISODate);
     m_id    = e.attribute("id");
 
     TQDomNode child = e.firstChild();
@@ -273,7 +273,7 @@ bool MyMoneyBudget::read(const TQDomElement& e)
         if("PERIOD" == per.tagName() && per.hasAttribute("amount") && per.hasAttribute("start"))
         {
           pGroup.setAmount( MyMoneyMoney(per.attribute("amount")) );
-          pGroup.setStartDate( TQDate::fromString(per.attribute("start"), Qt::ISODate) );
+          pGroup.setStartDate( TQDate::fromString(per.attribute("start"), TQt::ISODate) );
           account.addPeriod(pGroup.startDate(), pGroup);
         }
 

kmymoney2/mymoney/mymoneyprice.cpp

@@ -53,7 +53,7 @@ MyMoneyPrice::MyMoneyPrice(const TQString& from, const TQString& to, const TQDom
   m_fromSecurity = from;
   m_toSecurity = to;
 
-  m_date = TQDate::fromString(node.attribute("date"), Qt::ISODate);
+  m_date = TQDate::fromString(node.attribute("date"), TQt::ISODate);
   m_rate = MyMoneyMoney(node.attribute("price"));
   m_source = node.attribute("source");
 

kmymoney2/mymoney/mymoneyreport.cpp

@@ -551,9 +551,9 @@ void MyMoneyReport::write ( TQDomElement& e, TQDomDocument *doc, bool anonymous
     {
       TQDomElement f = doc->createElement ( "DATES" );
       if ( dateFrom.isValid() )
-        f.setAttribute ( "from", dateFrom.toString ( Qt::ISODate ) );
+        f.setAttribute ( "from", dateFrom.toString ( TQt::ISODate ) );
       if ( dateTo.isValid() )
-        f.setAttribute ( "to", dateTo.toString ( Qt::ISODate ) );
+        f.setAttribute ( "to", dateTo.toString ( TQt::ISODate ) );
       e.appendChild ( f );
     }
   }
@@ -736,9 +736,9 @@ bool MyMoneyReport::read ( const TQDomElement& e )
       {
         TQDate from, to;
         if ( c.hasAttribute ( "from" ) )
-          from = TQDate::fromString ( c.attribute ( "from" ), Qt::ISODate );
+          from = TQDate::fromString ( c.attribute ( "from" ), TQt::ISODate );
         if ( c.hasAttribute ( "to" ) )
-          to = TQDate::fromString ( c.attribute ( "to" ), Qt::ISODate );
+          to = TQDate::fromString ( c.attribute ( "to" ), TQt::ISODate );
         MyMoneyTransactionFilter::setDateFilter ( from, to );
       }
       if ( "PAYEE" == c.tagName() )

kmymoney2/mymoney/mymoneyscheduletest.cpp

@@ -263,13 +263,13 @@ void MyMoneyScheduleTest::testOverdue()
 		"  </TRANSACTION>\n"
 		" </SCHEDULED_TX>\n"
 		"</SCHEDULE-CONTAINER>\n");
-	TQString ref_overdue = ref.arg(startDate.toString(Qt::ISODate))
-	 .arg(lastPaymentDate.toString(Qt::ISODate))
-	 .arg(lastPaymentDate.toString(Qt::ISODate));
+	TQString ref_overdue = ref.arg(startDate.toString(TQt::ISODate))
+	 .arg(lastPaymentDate.toString(TQt::ISODate))
+	 .arg(lastPaymentDate.toString(TQt::ISODate));
 
-	TQString ref_intime = ref.arg(startDate.addDays(1).toString(Qt::ISODate))
-	 .arg(lastPaymentDate.addDays(1).toString(Qt::ISODate))
-	 .arg(lastPaymentDate.addDays(1).toString(Qt::ISODate));
+	TQString ref_intime = ref.arg(startDate.addDays(1).toString(TQt::ISODate))
+	 .arg(lastPaymentDate.addDays(1).toString(TQt::ISODate))
+	 .arg(lastPaymentDate.addDays(1).toString(TQt::ISODate));
 
 	TQDomDocument doc;
 	TQDomElement node;
@@ -1075,9 +1075,9 @@ void MyMoneyScheduleTest::testWriteXML() {
 		"  </TRANSACTION>\n"
 		" </SCHEDULED_TX>\n"
 		"</SCHEDULE-CONTAINER>\n"
-	).arg(TQDate::currentDate().toString(Qt::ISODate))
-	 .arg(TQDate::currentDate().toString(Qt::ISODate))
-	 .arg(TQDate::currentDate().toString(Qt::ISODate));
+	).arg(TQDate::currentDate().toString(TQt::ISODate))
+	 .arg(TQDate::currentDate().toString(TQt::ISODate))
+	 .arg(TQDate::currentDate().toString(TQt::ISODate));
 
 	CPPUNIT_ASSERT(doc.toString() == ref);
 }
@@ -1103,9 +1103,9 @@ void MyMoneyScheduleTest::testReadXML() {
 		"  </TRANSACTION>\n"
 		" </SCHEDULED_TX>\n"
 		"</SCHEDULE-CONTAINER>\n"
-	).arg(TQDate::currentDate().toString(Qt::ISODate))
-	 .arg(TQDate::currentDate().toString(Qt::ISODate))
-	 .arg(TQDate::currentDate().toString(Qt::ISODate));
+	).arg(TQDate::currentDate().toString(TQt::ISODate))
+	 .arg(TQDate::currentDate().toString(TQt::ISODate))
+	 .arg(TQDate::currentDate().toString(TQt::ISODate));
 
 	// diff to ref_ok1 is that we now have an empty entrydate
 	// in the transaction parameters
@@ -1127,9 +1127,9 @@ void MyMoneyScheduleTest::testReadXML() {
 		"  </TRANSACTION>\n"
 		" </SCHEDULED_TX>\n"
 		"</SCHEDULE-CONTAINER>\n"
-	).arg(TQDate::currentDate().toString(Qt::ISODate))
-	 .arg(TQDate::currentDate().toString(Qt::ISODate))
-	 .arg(TQDate::currentDate().toString(Qt::ISODate));
+	).arg(TQDate::currentDate().toString(TQt::ISODate))
+	 .arg(TQDate::currentDate().toString(TQt::ISODate))
+	 .arg(TQDate::currentDate().toString(TQt::ISODate));
 
 	TQString ref_false = TQString(
 		"<!DOCTYPE TEST>\n"
@@ -1149,9 +1149,9 @@ void MyMoneyScheduleTest::testReadXML() {
 		"  </TRANSACTION>\n"
 		" </SCHEDULED_TX>\n"
 		"</SCHEDULE-CONTAINER>\n"
-	).arg(TQDate::currentDate().toString(Qt::ISODate))
-	 .arg(TQDate::currentDate().toString(Qt::ISODate))
-	 .arg(TQDate::currentDate().toString(Qt::ISODate));
+	).arg(TQDate::currentDate().toString(TQt::ISODate))
+	 .arg(TQDate::currentDate().toString(TQt::ISODate))
+	 .arg(TQDate::currentDate().toString(TQt::ISODate));
 
 	TQDomDocument doc;
 	TQDomElement node;
@@ -1241,9 +1241,9 @@ void MyMoneyScheduleTest::testHasReferenceTo()
 		"  </TRANSACTION>\n"
 		" </SCHEDULED_TX>\n"
 		"</SCHEDULE-CONTAINER>\n"
-	).arg(TQDate::currentDate().toString(Qt::ISODate))
-	 .arg(TQDate::currentDate().toString(Qt::ISODate))
-	 .arg(TQDate::currentDate().toString(Qt::ISODate));
+	).arg(TQDate::currentDate().toString(TQt::ISODate))
+	 .arg(TQDate::currentDate().toString(TQt::ISODate))
+	 .arg(TQDate::currentDate().toString(TQt::ISODate));
 
 	TQDomDocument doc;
 	TQDomElement node;
@@ -1892,9 +1892,9 @@ void MyMoneyScheduleTest::testPaidEarlyOneTime()
                      "  </TRANSACTION>\n"
                      " </SCHEDULED_TX>\n"
                      "</SCHEDULE-CONTAINER>\n"
-                   ).arg(paymentInFuture.toString(Qt::ISODate))
-                   .arg(paymentInFuture.toString(Qt::ISODate))
-                   .arg(paymentInFuture.toString(Qt::ISODate));
+                   ).arg(paymentInFuture.toString(TQt::ISODate))
+                   .arg(paymentInFuture.toString(TQt::ISODate))
+                   .arg(paymentInFuture.toString(TQt::ISODate));
 
   TQDomDocument doc;
   TQDomElement node;

kmymoney2/mymoney/mymoneystatement.cpp

@@ -51,8 +51,8 @@ void MyMoneyStatement::write(TQDomElement& _root,TQDomDocument* _doc) const
   e.setAttribute("accountnumber", m_strAccountNumber);
   e.setAttribute("routingnumber", m_strRoutingNumber);
   e.setAttribute("currency", m_strCurrency);
-  e.setAttribute("begindate", m_dateBegin.toString(Qt::ISODate));
-  e.setAttribute("enddate", m_dateEnd.toString(Qt::ISODate));
+  e.setAttribute("begindate", m_dateBegin.toString(TQt::ISODate));
+  e.setAttribute("enddate", m_dateEnd.toString(TQt::ISODate));
   e.setAttribute("closingbalance", m_closingBalance.toString());
   e.setAttribute("type", kAccountTypeTxt[m_eType]);
   e.setAttribute("accountid", m_accountId);
@@ -63,7 +63,7 @@ void MyMoneyStatement::write(TQDomElement& _root,TQDomDocument* _doc) const
   while ( it_t != m_listTransactions.end() )
   {
     TQDomElement p = _doc->createElement("TRANSACTION");
-    p.setAttribute("dateposted", (*it_t).m_datePosted.toString(Qt::ISODate));
+    p.setAttribute("dateposted", (*it_t).m_datePosted.toString(TQt::ISODate));
     p.setAttribute("payee", (*it_t).m_strPayee);
     p.setAttribute("memo", (*it_t).m_strMemo);
     p.setAttribute("number", (*it_t).m_strNumber);
@@ -102,7 +102,7 @@ void MyMoneyStatement::write(TQDomElement& _root,TQDomDocument* _doc) const
   while ( it_p != m_listPrices.end() )
   {
     TQDomElement p = _doc->createElement("PRICE");
-    p.setAttribute("dateposted", (*it_p).m_date.toString(Qt::ISODate));
+    p.setAttribute("dateposted", (*it_p).m_date.toString(TQt::ISODate));
     p.setAttribute("security", (*it_p).m_strSecurity);
     p.setAttribute("amount", (*it_p).m_amount.toString());
 
@@ -139,8 +139,8 @@ bool MyMoneyStatement::read(const TQDomElement& _e)
     m_strAccountNumber = _e.attribute("accountnumber");
     m_strRoutingNumber = _e.attribute("routingnumber");
     m_strCurrency = _e.attribute("currency");
-    m_dateBegin = TQDate::fromString(_e.attribute("begindate"),Qt::ISODate);
-    m_dateEnd = TQDate::fromString(_e.attribute("enddate"),Qt::ISODate);
+    m_dateBegin = TQDate::fromString(_e.attribute("begindate"),TQt::ISODate);
+    m_dateEnd = TQDate::fromString(_e.attribute("enddate"),TQt::ISODate);
     m_closingBalance = MyMoneyMoney(_e.attribute("closingbalance"));
     m_accountId = _e.attribute("accountid");
     m_skipCategoryMatching = !(_e.attribute("skipCategoryMatching").isEmpty());
@@ -158,7 +158,7 @@ bool MyMoneyStatement::read(const TQDomElement& _e)
       {
         MyMoneyStatement::Transaction t;
 
-        t.m_datePosted = TQDate::fromString(c.attribute("dateposted"),Qt::ISODate);
+        t.m_datePosted = TQDate::fromString(c.attribute("dateposted"),TQt::ISODate);
         t.m_amount = MyMoneyMoney(c.attribute("amount"));
         t.m_strMemo = c.attribute("memo");
         t.m_strNumber = c.attribute("number");
@@ -197,7 +197,7 @@ bool MyMoneyStatement::read(const TQDomElement& _e)
       {
         MyMoneyStatement::Price p;
 
-        p.m_date = TQDate::fromString(c.attribute("dateposted"), Qt::ISODate);
+        p.m_date = TQDate::fromString(c.attribute("dateposted"), TQt::ISODate);
         p.m_strSecurity = c.attribute("security");
         p.m_amount = MyMoneyMoney(c.attribute("amount"));
 

kmymoney2/mymoney/mymoneyutils.cpp

@@ -307,7 +307,7 @@ void MyMoneyTracer::off(void)
 TQString dateToString(const TQDate& date)
 {
   if(!date.isNull() && date.isValid())
-    return date.toString(Qt::ISODate);
+    return date.toString(TQt::ISODate);
 
   return TQString::null;
 }
@@ -315,7 +315,7 @@ TQString dateToString(const TQDate& date)
 TQDate stringToDate(const TQString& str)
 {
   if(str.length()) {
-    TQDate date = TQDate::fromString(str, Qt::ISODate);
+    TQDate date = TQDate::fromString(str, TQt::ISODate);
     if(!date.isNull() && date.isValid())
       return date;
   }

kmymoney2/mymoney/mymoneyutils.h

@@ -162,7 +162,7 @@ KMYMONEY_EXPORT void _CheckMemory_End();
 #endif // _CHECK_MEMORY
 
 /**
- * This function returns a date in the form specified by Qt::ISODate.
+ * This function returns a date in the form specified by TQt::ISODate.
  * If the @p date is invalid an empty string will be returned.
  *
  * @param date const reference to date to be converted
@@ -172,11 +172,11 @@ KMYMONEY_EXPORT TQString dateToString(const TQDate& date);
 
 /**
  * This function returns a date as TQDate object as specified by
- * the parameter @p str. @p str must be in Qt::ISODate format.
+ * the parameter @p str. @p str must be in TQt::ISODate format.
  * If @p str is empty or contains an invalid date, TQDate() is
  * returned.
  *
- * @param str date in Qt::ISODate format
+ * @param str date in TQt::ISODate format
  * @return TQDate object
  */
 KMYMONEY_EXPORT TQDate stringToDate(const TQString& str);

kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp

@@ -931,7 +931,7 @@ const MyMoneyMoney MyMoneyDatabaseMgr::balance(const TQString& id, const TQDate&
   MyMoneyAccount acc;
   TQMap<TQString, MyMoneyAccount> accountList = m_sql->fetchAccounts(/*TQString(id)*/);
   //TQMap<TQString, MyMoneyAccount>::const_iterator accpos = accountList.find(id);
-  if (date_ != TQDate()) tqDebug (TQString("request balance for %1 at %2").arg(id).arg(date_.toString(Qt::ISODate)));
+  if (date_ != TQDate()) tqDebug (TQString("request balance for %1 at %2").arg(id).arg(date_.toString(TQt::ISODate)));
 //  if(!date_.isValid() && MyMoneyFile::instance()->account(id).accountType() != MyMoneyAccount::Stock) {
 //    if(accountList.find(id) != accountList.end())
 //      return accountList[id].balance();

kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp

@@ -874,7 +874,7 @@ const MyMoneyMoney MyMoneySeqAccessMgr::balance(const TQString& id, const TQDate
 {
   MyMoneyMoney result(0);
   MyMoneyAccount acc;
-  // if (date != TQDate()) tqDebug(TQString("request balance for %1 at %2").arg(id).arg(date.toString(Qt::ISODate)));
+  // if (date != TQDate()) tqDebug(TQString("request balance for %1 at %2").arg(id).arg(date.toString(TQt::ISODate)));
   if(!date.isValid() && account(id).accountType() != MyMoneyAccount::Stock) {
     if(m_accountList.find(id) != m_accountList.end())
       return m_accountList[id].balance();

kmymoney2/mymoney/storage/mymoneystoragedump.cpp

@@ -69,8 +69,8 @@ void MyMoneyStorageDump::writeStream(TQDataStream& _s, IMyMoneySerialize* _stora
   s << "user zip = " << user.postcode() << "\n";
   s << "user telephone = " << user.telephone() << "\n";
   s << "user e-mail = " << user.email() << "\n";
-  s << "creation date = " << storage->creationDate().toString(Qt::ISODate) << "\n";
-  s << "last modification date = " << storage->lastModificationDate().toString(Qt::ISODate) << "\n";
+  s << "creation date = " << storage->creationDate().toString(TQt::ISODate) << "\n";
+  s << "last modification date = " << storage->lastModificationDate().toString(TQt::ISODate) << "\n";
   s << "base currency = " << storage->value("kmm-baseCurrency") << "\n";
   s << "\n";
 
@@ -182,9 +182,9 @@ void MyMoneyStorageDump::writeStream(TQDataStream& _s, IMyMoneySerialize* _stora
     }
     s << "\n";
 
-    s << "  Opening data = " << (*it_a).openingDate().toString(Qt::ISODate) << "\n";
-    s << "  Last modified = " << (*it_a).lastModified().toString(Qt::ISODate) << "\n";
-    s << "  Last reconciled = " << (*it_a).lastReconciliationDate().toString(Qt::ISODate) << "\n";
+    s << "  Opening data = " << (*it_a).openingDate().toString(TQt::ISODate) << "\n";
+    s << "  Last modified = " << (*it_a).lastModified().toString(TQt::ISODate) << "\n";
+    s << "  Last reconciled = " << (*it_a).lastReconciliationDate().toString(TQt::ISODate) << "\n";
     s << "  Balance = " << (*it_a).balance().formatMoney("", 2) << "\n";
 
     dumpKVP("  KVP: ", s, *it_a);
@@ -294,9 +294,9 @@ void MyMoneyStorageDump::writeStream(TQDataStream& _s, IMyMoneySerialize* _stora
   for(it_s = list_s.begin(); it_s != list_s.end(); ++it_s) {
     s << "  ID = " << (*it_s).id() << "\n";
     s << "  Name = " << (*it_s).name() << "\n";
-    s << "  Startdate = " << (*it_s).startDate().toString(Qt::ISODate) << "\n";
+    s << "  Startdate = " << (*it_s).startDate().toString(TQt::ISODate) << "\n";
     if((*it_s).willEnd())
-      s << "  Enddate   = " << (*it_s).endDate().toString(Qt::ISODate) << "\n";
+      s << "  Enddate   = " << (*it_s).endDate().toString(TQt::ISODate) << "\n";
     else
       s << "  Enddate   = not specified\n";
     s << "  Occurence = " << (*it_s).occurenceToString() << "\n";
@@ -307,13 +307,13 @@ void MyMoneyStorageDump::writeStream(TQDataStream& _s, IMyMoneySerialize* _stora
     s << "  AutoEnter = " << (*it_s).autoEnter() << "\n";
 
     if((*it_s).lastPayment().isValid())
-      s << "  Last payment = " << (*it_s).lastPayment().toString(Qt::ISODate) << "\n";
+      s << "  Last payment = " << (*it_s).lastPayment().toString(TQt::ISODate) << "\n";
     else
       s << "  Last payment = not defined" << "\n";
     if((*it_s).isFinished())
       s << "  Next payment = payment finished" << "\n";
     else {
-      s << "  Next payment = " << (*it_s).nextDueDate().toString(Qt::ISODate) << "\n";
+      s << "  Next payment = " << (*it_s).nextDueDate().toString(TQt::ISODate) << "\n";
       if((*it_s).isOverdue())
       s << "               = overdue!" << "\n";
     }
@@ -325,7 +325,7 @@ void MyMoneyStorageDump::writeStream(TQDataStream& _s, IMyMoneySerialize* _stora
     if(list_d.count() > 0) {
       s << "  Recorded payments" << "\n";
       for(it_d = list_d.begin(); it_d != list_d.end(); ++it_d) {
-        s << "    " << (*it_d).toString(Qt::ISODate) << "\n";
+        s << "    " << (*it_d).toString(TQt::ISODate) << "\n";
       }
     }
     s << "  TRANSACTION\n";
@@ -358,8 +358,8 @@ void MyMoneyStorageDump::dumpKVP(const TQString& headline, TQTextStream& s, cons
 void MyMoneyStorageDump::dumpTransaction(TQTextStream& s, IMyMoneyStorage* storage, const MyMoneyTransaction& it_t)
 {
   s << "  ID = " << it_t.id() << "\n";
-  s << "  Postdate  = " << it_t.postDate().toString(Qt::ISODate) << "\n";
-  s << "  EntryDate = " << it_t.entryDate().toString(Qt::ISODate) << "\n";
+  s << "  Postdate  = " << it_t.postDate().toString(TQt::ISODate) << "\n";
+  s << "  EntryDate = " << it_t.entryDate().toString(TQt::ISODate) << "\n";
   s << "  Commodity = [" << it_t.commodity() << "]\n";
   s << "  Memo = " << it_t.memo() << "\n";
   s << "  BankID = " << it_t.bankID() << "\n";
@@ -398,7 +398,7 @@ void MyMoneyStorageDump::dumpTransaction(TQTextStream& s, IMyMoneyStorage* stora
     s << "    Nr = '" << (*it_s).number() << "'\n";
     s << "    ReconcileFlag = '" << reconcileToString((*it_s).reconcileFlag()) << "'\n";
     if((*it_s).reconcileFlag() != MyMoneySplit::NotReconciled) {
-      s << "    ReconcileDate = " << (*it_s).reconcileDate().toString(Qt::ISODate) << "\n";
+      s << "    ReconcileDate = " << (*it_s).reconcileDate().toString(TQt::ISODate) << "\n";
     }
     s << "    BankID = " << (*it_s).bankID() << "\n";
     dumpKVP("KVP:", s, (*it_s), 4);

kmymoney2/mymoney/storage/mymoneystoragesql.cpp

@@ -203,7 +203,7 @@ try {
     m_error = TQString
         (i18n("Database apparently in use\nOpened by %1 on %2 at %3.\nOpen anyway?"))
         .arg(m_logonUser)
-        .arg(m_logonAt.date().toString(Qt::ISODate))
+        .arg(m_logonAt.date().toString(TQt::ISODate))
         .arg(m_logonAt.time().toString("hh.mm.ss"));
     tqDebug(m_error);
     close(false);
@@ -441,7 +441,7 @@ int MyMoneyStorageSql::upgradeToV1() {
   TQMap<TQString, TQDateTime>::ConstIterator it;
   for (it = tids.begin(); it != tids.end(); ++it) {
     q.prepare ("UPDATE kmmSplits SET postDate=:postDate WHERE transactionId = :id;");
-    q.bindValue(":postDate", it.data().toString(Qt::ISODate));
+    q.bindValue(":postDate", it.data().toString(TQt::ISODate));
     q.bindValue(":id", it.key());
     if (!q.exec()) {
       buildError (q, __func__, "priming kmmSplits.postDate");
@@ -1305,13 +1305,13 @@ void MyMoneyStorageSql::writeAccount(const MyMoneyAccount& acc, MyMoneySqlQuery&
   if (acc.lastReconciliationDate() == TQDate())
     q.bindValue(":lastReconciled", acc.lastReconciliationDate());
   else
-    q.bindValue(":lastReconciled", TQString(acc.lastReconciliationDate().toString(Qt::ISODate)));
+    q.bindValue(":lastReconciled", TQString(acc.lastReconciliationDate().toString(TQt::ISODate)));
 
   q.bindValue(":lastModified", acc.lastModified());
   if (acc.openingDate() == TQDate())
     q.bindValue(":openingDate", acc.openingDate());
   else
-    q.bindValue(":openingDate", TQString(acc.openingDate().toString(Qt::ISODate)));
+    q.bindValue(":openingDate", TQString(acc.openingDate().toString(TQt::ISODate)));
 
   q.bindValue(":accountNumber", acc.number());
   q.bindValue(":accountType", acc.accountType());
@@ -1483,9 +1483,9 @@ void MyMoneyStorageSql::writeTransaction(const TQString& txId, const MyMoneyTran
   DBG("*** Entering MyMoneyStorageSql::writeTransaction");
   q.bindValue(":id", txId);
   q.bindValue(":txType", type);
-  q.bindValue(":postDate", TQString(tx.postDate().toString(Qt::ISODate)));
+  q.bindValue(":postDate", TQString(tx.postDate().toString(TQt::ISODate)));
   q.bindValue(":memo", tx.memo());
-  q.bindValue(":entryDate", TQString(tx.entryDate().toString(Qt::ISODate)));
+  q.bindValue(":entryDate", TQString(tx.entryDate().toString(TQt::ISODate)));
   q.bindValue(":currencyId", tx.commodity());
   q.bindValue(":bankId", tx.bankID());
   if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("writing Transaction")));
@@ -1547,7 +1547,7 @@ void MyMoneyStorageSql::writeSplit(const TQString& txId, const MyMoneySplit& spl
   if (split.reconcileDate() == TQDate())
     q.bindValue(":reconcileDate", split.reconcileDate());
   else
-    q.bindValue(":reconcileDate", TQString(split.reconcileDate().toString(Qt::ISODate)));
+    q.bindValue(":reconcileDate", TQString(split.reconcileDate().toString(TQt::ISODate)));
   q.bindValue(":action", split.action());
   q.bindValue(":reconcileFlag", split.reconcileFlag());
   q.bindValue(":value", split.value().toString());
@@ -1574,7 +1574,7 @@ void MyMoneyStorageSql::writeSplit(const TQString& txId, const MyMoneySplit& spl
   q.bindValue(":memo", split.memo());
   q.bindValue(":accountId", split.accountId());
   q.bindValue(":checkNumber", split.number());
-  q.bindValue(":postDate", m_txPostDate.toString(Qt::ISODate)); // FIXME: when Tom puts date into split object
+  q.bindValue(":postDate", m_txPostDate.toString(TQt::ISODate)); // FIXME: when Tom puts date into split object
   q.bindValue(":bankId", split.bankID());
   if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("writing Split")));
   deleteKeyValuePairs("SPLIT", txId + TQString::number(splitId));
@@ -1675,8 +1675,8 @@ void MyMoneyStorageSql::writeSchedule(const MyMoneySchedule& sch, MyMoneySqlQuer
   q.bindValue(":occurenceString", sch.occurenceToString());
   q.bindValue(":paymentType", sch.paymentType());
   q.bindValue(":paymentTypeString", MyMoneySchedule::paymentMethodToString(sch.paymentType()));
-  q.bindValue(":startDate", TQString(sch.startDate().toString(Qt::ISODate)));
-  q.bindValue(":endDate", TQString(sch.endDate().toString(Qt::ISODate)));
+  q.bindValue(":startDate", TQString(sch.startDate().toString(TQt::ISODate)));
+  q.bindValue(":endDate", TQString(sch.endDate().toString(TQt::ISODate)));
   if (sch.isFixed()) {
     q.bindValue(":fixed", "Y");
   } else {
@@ -1688,7 +1688,7 @@ void MyMoneyStorageSql::writeSchedule(const MyMoneySchedule& sch, MyMoneySqlQuer
     q.bindValue(":autoEnter", "N");
   }
   q.bindValue(":lastPayment", sch.lastPayment());
-  q.bindValue(":nextPaymentDue", TQString(sch.nextDueDate().toString(Qt::ISODate)));
+  q.bindValue(":nextPaymentDue", TQString(sch.nextDueDate().toString(TQt::ISODate)));
   q.bindValue(":weekendOption", sch.weekendOption());
   q.bindValue(":weekendOptionString", MyMoneySchedule::weekendOptionToString(sch.weekendOption()));
   if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("writing Schedules")));
@@ -1704,7 +1704,7 @@ void MyMoneyStorageSql::writeSchedule(const MyMoneySchedule& sch, MyMoneySqlQuer
   TQValueList<TQDate>::ConstIterator it;
   for (it=payments.begin(); it!=payments.end(); ++it) {
     q.bindValue(":schedId", sch.id());
-    q.bindValue(":payDate", TQString((*it).toString(Qt::ISODate)));
+    q.bindValue(":payDate", TQString((*it).toString(TQt::ISODate)));
     if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("writing Schedule Payment History")));
   }
 
@@ -1856,7 +1856,7 @@ void MyMoneyStorageSql::addPrice(const MyMoneyPrice& p) {
   q.prepare (s);
   q.bindValue(":fromId", p.from());
   q.bindValue(":toId", p.to());
-  q.bindValue(":priceDate", TQString(p.date().toString(Qt::ISODate)));
+  q.bindValue(":priceDate", TQString(p.date().toString(TQt::ISODate)));
   if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("finding Price")));
   if (q.next()) {
     q.prepare(m_db.m_tables["kmmPrices"].updateString());
@@ -1867,7 +1867,7 @@ void MyMoneyStorageSql::addPrice(const MyMoneyPrice& p) {
   }
   q.bindValue(":fromId", p.from());
   q.bindValue(":toId", p.to());
-  q.bindValue(":priceDate", TQString(p.date().toString(Qt::ISODate)));
+  q.bindValue(":priceDate", TQString(p.date().toString(TQt::ISODate)));
   q.bindValue(":price", p.rate(TQString()).toString());
   q.bindValue(":priceFormatted",
     p.rate(TQString()).formatMoney("", KMyMoneySettings::pricePrecision()));
@@ -1885,7 +1885,7 @@ void MyMoneyStorageSql::removePrice(const MyMoneyPrice& p) {
   q.prepare (m_db.m_tables["kmmPrices"].deleteString());
   q.bindValue(":fromId", p.from());
   q.bindValue(":toId", p.to());
-  q.bindValue(":priceDate", TQString(p.date().toString(Qt::ISODate)));
+  q.bindValue(":priceDate", TQString(p.date().toString(TQt::ISODate)));
   if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("deleting Price")));
   --m_prices;
   writeFileInfo();
@@ -1898,7 +1898,7 @@ void MyMoneyStorageSql::writePrice(const MyMoneyPrice& p) {
   q.prepare (m_db.m_tables["kmmPrices"].insertString());
   q.bindValue(":fromId", p.from());
   q.bindValue(":toId", p.to());
-  q.bindValue(":priceDate", TQString(p.date().toString(Qt::ISODate)));
+  q.bindValue(":priceDate", TQString(p.date().toString(TQt::ISODate)));
   q.bindValue(":price", p.rate(TQString()).toString());
   q.bindValue(":priceFormatted", p.rate(TQString()).formatMoney("", 2));
   q.bindValue(":priceSource", p.source());
@@ -2175,9 +2175,9 @@ void MyMoneyStorageSql::writeFileInfo() {
   q.prepare(qs);
   q.bindValue(":version", m_dbVersion);
   q.bindValue(":fixLevel", m_storage->fileFixVersion());
-  q.bindValue(":created", TQString(m_storage->creationDate().toString(Qt::ISODate)));
-  //q.bindValue(":lastModified", m_storage->lastModificationDate().toString(Qt::ISODate));
-  q.bindValue(":lastModified", TQString(TQDate::currentDate().toString(Qt::ISODate)));
+  q.bindValue(":created", TQString(m_storage->creationDate().toString(TQt::ISODate)));
+  //q.bindValue(":lastModified", m_storage->lastModificationDate().toString(TQt::ISODate));
+  q.bindValue(":lastModified", TQString(TQDate::currentDate().toString(TQt::ISODate)));
   q.bindValue(":baseCurrency", m_storage->pairs()["kmm-baseCurrency"]);
   q.bindValue(":institutions", (unsigned long long) m_institutions);
   q.bindValue(":accounts", (unsigned long long) m_accounts);
@@ -2218,7 +2218,7 @@ void MyMoneyStorageSql::writeFileInfo() {
   q.bindValue(":encryptData", m_encryptData);
   q.bindValue(":updateInProgress", "N");
   q.bindValue(":logonUser", m_logonUser);
-  q.bindValue(":logonAt", m_logonAt.toString(Qt::ISODate));
+  q.bindValue(":logonAt", m_logonAt.toString(TQt::ISODate));
   if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("writing FileInfo")));
 }
 
@@ -2633,7 +2633,7 @@ const TQMap<TQString, MyMoneyMoney> MyMoneyStorageSql::fetchBalance(const TQStri
   // the <= operator misbehave when the date matches. To avoid this, add a day to the
   // requested date and use the < operator.
   if (date.isValid() && !date.isNull())
-    queryString += TQString(" AND postDate < '%1'").arg(date.addDays(1).toString(Qt::ISODate));
+    queryString += TQString(" AND postDate < '%1'").arg(date.addDays(1).toString(TQt::ISODate));
   DBG (queryString);
   q.prepare(queryString);
 
@@ -2951,11 +2951,11 @@ const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions (
   TQString dateClause;
   TQString connector = "";
   if (end != TQDate()) {
-    dateClause = TQString("(postDate < '%1')").arg(end.addDays(1).toString(Qt::ISODate));
+    dateClause = TQString("(postDate < '%1')").arg(end.addDays(1).toString(TQt::ISODate));
     connector = " and ";
   }
   if (start != TQDate()) {
-    dateClause += TQString("%1 (postDate >= '%2')").arg(connector).arg(start.toString(Qt::ISODate));
+    dateClause += TQString("%1 (postDate >= '%2')").arg(connector).arg(start.toString(TQt::ISODate));
   }
   // now get a list of transaction ids
   // if we have only a date filter, we need to build the list from the tx table
@@ -3259,10 +3259,10 @@ const  MyMoneyPrice MyMoneyStorageSql::fetchSinglePrice (const TQString& fromIdL
 
   q.bindValue(":fromId", fromIdList);
   q.bindValue(":toId", toIdList);
-  q.bindValue(":priceDate", TQString(date.addDays(1).toString(Qt::ISODate)));
+  q.bindValue(":priceDate", TQString(date.addDays(1).toString(TQt::ISODate)));
 
   if (exactDate)
-    q.bindValue(":exactDate", TQString(date.toString(Qt::ISODate)));
+    q.bindValue(":exactDate", TQString(date.toString(TQt::ISODate)));
 
   if (! q.exec()) {}
 
@@ -4141,9 +4141,9 @@ const TQString MyMoneyDbDef::generateSQL (const TQString& driver) const {
       replace =  TQString::number
           (MyMoneyFile::instance()->storage()->currentFixVersion());
     if ((*fit)->name() == "created")
-      replace = TQDate::currentDate().toString(Qt::ISODate);
+      replace = TQDate::currentDate().toString(TQt::ISODate);
     if ((*fit)->name() == "lastModified")
-      replace = TQDate::currentDate().toString(Qt::ISODate);
+      replace = TQDate::currentDate().toString(TQt::ISODate);
     if ((*fit)->name() == "updateInProgress")
       replace = enclose("N");
     qs.replace(toReplace, replace);

kmymoney2/mymoney/storage/mymoneystoragesql.h

@@ -661,11 +661,11 @@ private:
   int splitState(const MyMoneyTransactionFilter::stateOptionE& state) const;
 
   inline const TQDate getDate (const TQString& date) const {
-    return (date.isNull() ? TQDate() : TQDate::fromString(date, Qt::ISODate));
+    return (date.isNull() ? TQDate() : TQDate::fromString(date, TQt::ISODate));
   }
 
   inline const TQDateTime getDateTime (const TQString& date) const {
-    return (date.isNull() ? TQDateTime() : TQDateTime::fromString(date, Qt::ISODate));
+    return (date.isNull() ? TQDateTime() : TQDateTime::fromString(date, TQt::ISODate));
   }
 
   // open routines

kmymoney2/mymoney/storage/mymoneystoragexml.cpp

@@ -841,7 +841,7 @@ void MyMoneyStorageXML::writePricePair(TQDomElement& price, const MyMoneyPriceEn
 
 void MyMoneyStorageXML::writePrice(TQDomElement& price, const MyMoneyPrice& p)
 {
-  price.setAttribute("date", p.date().toString(Qt::ISODate));
+  price.setAttribute("date", p.date().toString(TQt::ISODate));
   price.setAttribute("price", p.rate(TQString()).toString());
   price.setAttribute("source", p.source());
 }

kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp

@@ -149,7 +149,7 @@ TQDate MyMoneyOfxConnector::statementStartDate(void) const {
   }
   else if ((m_fiSettings.value("kmmofx-lastUpdate").toInt() != 0) && !m_account.value("lastImportedTransactionDate").isEmpty())
   {
-    return TQDate::fromString(m_account.value("lastImportedTransactionDate"), Qt::ISODate);
+    return TQDate::fromString(m_account.value("lastImportedTransactionDate"), TQt::ISODate);
   }
   else if ((m_fiSettings.value("kmmofx-pickDate").toInt() != 0) && !m_fiSettings.value("kmmofx-specificDate").isEmpty())
   {
@@ -356,8 +356,8 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::message(const TQString& _msgType,
 
 MyMoneyOfxConnector::Tag MyMoneyOfxConnector::investmentRequest(void) const
 {
-  TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
-  TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtnow_string = TQDateTime::currentDateTime().toString(TQt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtstart_string = _dtstart.toString(TQt::ISODate).remove(TQRegExp("[^0-9]"));
 
   return message("INVSTMT","INVSTMT",Tag("INVSTMTRQ")
     .subtag(Tag("INVACCTFROM").element("BROKERID", fiorg()).element("ACCTID", accountnum()))
@@ -369,7 +369,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::investmentRequest(void) const
 
 MyMoneyOfxConnector::Tag MyMoneyOfxConnector::bankStatementRequest(const TQDate& _dtstart) const
 {
-  TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtstart_string = _dtstart.toString(TQt::ISODate).remove(TQRegExp("[^0-9]"));
 
   return message("BANK","STMT",Tag("STMTRQ")
     .subtag(Tag("BANKACCTFROM").element("BANKID", iban()).element("ACCTID", accountnum()).element("ACCTTYPE", "CHECKING"))
@@ -378,7 +378,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::bankStatementRequest(const TQDate&
 
 MyMoneyOfxConnector::Tag MyMoneyOfxConnector::creditCardRequest(const TQDate& _dtstart) const
 {
-  TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtstart_string = _dtstart.toString(TQt::ISODate).remove(TQRegExp("[^0-9]"));
 
   return message("CREDITCARD","CCSTMT",Tag("CCSTMTRQ")
     .subtag(Tag("CCACCTFROM").element("ACCTID",accountnum()))
@@ -387,7 +387,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::creditCardRequest(const TQDate& _d
 
 MyMoneyOfxConnector::Tag MyMoneyOfxConnector::signOn(void) const
 {
-  TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtnow_string = TQDateTime::currentDateTime().toString(TQt::ISODate).remove(TQRegExp("[^0-9]"));
 
   Tag fi("FI");
   fi.element("ORG",fiorg());
@@ -456,7 +456,7 @@ const TQByteArray MyMoneyOfxConnector::statementResponse(const TQDate& _dtstart)
 
 MyMoneyOfxConnector::Tag MyMoneyOfxConnector::signOnResponse(void) const
 {
-  TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtnow_string = TQDateTime::currentDateTime().toString(TQt::ISODate).remove(TQRegExp("[^0-9]"));
 
   Tag sonrs("SONRS");
   sonrs
@@ -494,8 +494,8 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::bankStatementResponse(const TQDate
 {
   MyMoneyFile* file = MyMoneyFile::instance();
 
-  TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
-  TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtstart_string = _dtstart.toString(TQt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtnow_string = TQDateTime::currentDateTime().toString(TQt::ISODate).remove(TQRegExp("[^0-9]"));
 
   TQString transactionlist;
 
@@ -521,8 +521,8 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::creditCardStatementResponse(const
 {
   MyMoneyFile* file = MyMoneyFile::instance();
 
-  TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
-  TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtstart_string = _dtstart.toString(TQt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtnow_string = TQDateTime::currentDateTime().toString(TQt::ISODate).remove(TQRegExp("[^0-9]"));
 
   TQString transactionlist;
 
@@ -548,8 +548,8 @@ TQString MyMoneyOfxConnector::investmentStatementResponse(const TQDate& _dtstart
 {
   MyMoneyFile* file = MyMoneyFile::instance();
 
-  TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
-  TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtstart_string = _dtstart.toString(TQt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtnow_string = TQDateTime::currentDateTime().toString(TQt::ISODate).remove(TQRegExp("[^0-9]"));
 
   TQString transactionlist;
 
@@ -612,7 +612,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::transaction(const MyMoneyTransacti
     // This is a temporary hack.  I don't use the trntype field in importing at all,
     // but libofx requires it to be there in order to import the file.
     .element("TRNTYPE","DEBIT")
-    .element("DTPOSTED",_t.postDate().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")))
+    .element("DTPOSTED",_t.postDate().toString(TQt::ISODate).remove(TQRegExp("[^0-9]")))
     .element("TRNAMT",s.value().formatMoney(TQString(),2));
 
   if ( ! _t.bankID().isEmpty() )
@@ -642,7 +642,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::investmentTransaction(const MyMone
   TQCString stockid = file->account(s.accountId()).currencyId();
 
   Tag invtran("INVTRAN");
-  invtran.element("FITID",_t.id()).element("DTTRADE",_t.postDate().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")));
+  invtran.element("FITID",_t.id()).element("DTTRADE",_t.postDate().toString(TQt::ISODate).remove(TQRegExp("[^0-9]")));
   if ( !_t.memo().isEmpty() )
     invtran.element("MEMO",_t.memo());
 

kmymoney2/plugins/ofximport/ofximporterplugin.cpp

@@ -184,13 +184,13 @@ int OfxImporterPlugin::ofxTransactionCallback(struct OfxTransactionData data, vo
   if(data.date_posted_valid==true)
   {
     TQDateTime dt;
-    dt.setTime_t(data.date_posted, Qt::UTC);
+    dt.setTime_t(data.date_posted, TQt::UTC);
     t.m_datePosted = dt.date();
   }
   else if(data.date_initiated_valid==true)
   {
     TQDateTime dt;
-    dt.setTime_t(data.date_initiated, Qt::UTC);
+    dt.setTime_t(data.date_initiated, TQt::UTC);
     t.m_datePosted = dt.date();
   }
 
@@ -414,14 +414,14 @@ int OfxImporterPlugin::ofxStatementCallback(struct OfxStatementData data, void*
   if(data.date_start_valid==true)
   {
     TQDateTime dt;
-    dt.setTime_t(data.date_start, Qt::UTC);
+    dt.setTime_t(data.date_start, TQt::UTC);
     s.m_dateBegin = dt.date();
   }
 
   if(data.date_end_valid==true)
   {
     TQDateTime dt;
-    dt.setTime_t(data.date_end, Qt::UTC);
+    dt.setTime_t(data.date_end, TQt::UTC);
     s.m_dateEnd = dt.date();
   }
 

kmymoney2/reports/listtable.cpp

@@ -519,7 +519,7 @@ namespace reports {
 
           // if we have a locale() then use its date formatter
           if ( TDEGlobal::locale() && ! data.isEmpty() ) {
-            TQDate qd = TQDate::fromString ( data, Qt::ISODate );
+            TQDate qd = TQDate::fromString ( data, TQt::ISODate );
             data = TDEGlobal::locale()->formatDate ( qd, true );
           }
           result += TQString ( "<td class=\"left\">%1</td>" ).arg ( data );

kmymoney2/reports/objectinfotable.cpp

@@ -170,7 +170,7 @@ void ObjectInfoTable::constructScheduleTable ( void )
       //schedule data
       scheduleRow["id"] = schedule.id();
       scheduleRow["name"] = schedule.name();
-      scheduleRow["nextduedate"] = schedule.nextDueDate().toString ( Qt::ISODate );
+      scheduleRow["nextduedate"] = schedule.nextDueDate().toString ( TQt::ISODate );
       scheduleRow["type"] = KMyMoneyUtils::scheduleTypeToString ( schedule.type() );
       scheduleRow["occurence"] = i18n(schedule.occurenceToString().utf8());
       scheduleRow["paymenttype"] = KMyMoneyUtils::paymentMethodToString ( schedule.paymentType() );
@@ -202,7 +202,7 @@ void ObjectInfoTable::constructScheduleTable ( void )
           splitRow["id"] = schedule.id();
           splitRow["name"] = schedule.name();
           splitRow["type"] = KMyMoneyUtils::scheduleTypeToString ( schedule.type() );
-          splitRow["nextduedate"] = schedule.nextDueDate().toString ( Qt::ISODate );
+          splitRow["nextduedate"] = schedule.nextDueDate().toString ( TQt::ISODate );
 
           if ( ( *split_it ).value() == MyMoneyMoney::autoCalc ) {
             splitRow["split"] = MyMoneyMoney::autoCalc.toString();
@@ -259,7 +259,7 @@ void ObjectInfoTable::constructAccountTable ( void )
       accountRow["name"] = account.name();
       accountRow["number"] = account.number();
       accountRow["description"] = account.description();
-      accountRow["openingdate"] = account.openingDate().toString( Qt::ISODate );
+      accountRow["openingdate"] = account.openingDate().toString( TQt::ISODate );
       //accountRow["currency"] = (file->currency(account.currencyId())).tradingSymbol();
       accountRow["currencyname"] = (file->currency(account.currencyId())).name();
       accountRow["balancewarning"] = account.value("minBalanceEarly");
@@ -320,13 +320,13 @@ void ObjectInfoTable::constructAccountLoanTable ( void )
       accountRow["name"] = account.name();
       accountRow["number"] = account.number();
       accountRow["description"] = account.description();
-      accountRow["openingdate"] = account.openingDate().toString( Qt::ISODate );
+      accountRow["openingdate"] = account.openingDate().toString( TQt::ISODate );
       //accountRow["currency"] = (file->currency(account.currencyId())).tradingSymbol();
       accountRow["currencyname"] = (file->currency(account.currencyId())).name();
       accountRow["payee"] = file->payee(loan.payee()).name();
       accountRow["loanamount"] = (loan.loanAmount() * xr).toString();
       accountRow["interestrate"] = (loan.interestRate(TQDate::currentDate())/MyMoneyMoney(100,1)*xr).toString();
-      accountRow["nextinterestchange"] = loan.nextInterestChange().toString( Qt::ISODate );
+      accountRow["nextinterestchange"] = loan.nextInterestChange().toString( TQt::ISODate );
       accountRow["periodicpayment"] = (loan.periodicPayment() * xr).toString();
       accountRow["finalpayment"] = (loan.finalPayment() * xr).toString();
       accountRow["favorite"] = account.value("PreferredAccount");

kmymoney2/reports/querytable.cpp

@@ -88,7 +88,7 @@ CashFlowListItem CashFlowList::mostRecent(void) const
   CashFlowList dupe( *this );
   qHeapSort( dupe );
 
-  //kdDebug(2) << " CashFlowList::mostRecent() == " << dupe.back().date().toString(Qt::ISODate) << endl;
+  //kdDebug(2) << " CashFlowList::mostRecent() == " << dupe.back().date().toString(TQt::ISODate) << endl;
 
   return dupe.back();
 }
@@ -229,7 +229,7 @@ void CashFlowList::dumpDebug(void) const
   const_iterator it_item = begin();
   while ( it_item != end() )
   {
-    kdDebug(2) << TQString((*it_item).date().toString(Qt::ISODate)) << " " << (*it_item).value().toString() << endl;
+    kdDebug(2) << TQString((*it_item).date().toString(TQt::ISODate)) << " " << (*it_item).value().toString() << endl;
     ++it_item;
   }
 }
@@ -431,13 +431,13 @@ void QueryTable::constructTransactionTable(void)
     TQDate pd;
 
     qA["id"] = qS["id"] = (* it_transaction).id();
-    qA["entrydate"] = qS["entrydate"] = (* it_transaction).entryDate().toString(Qt::ISODate);
-    qA["postdate"] = qS["postdate"] = (* it_transaction).postDate().toString(Qt::ISODate);
+    qA["entrydate"] = qS["entrydate"] = (* it_transaction).entryDate().toString(TQt::ISODate);
+    qA["postdate"] = qS["postdate"] = (* it_transaction).postDate().toString(TQt::ISODate);
     qA["commodity"] = qS["commodity"] = (* it_transaction).commodity();
 
     pd = (* it_transaction).postDate();
-    qA["month"] = qS["month"] = i18n("Month of %1").arg(TQDate(pd.year(),pd.month(),1).toString(Qt::ISODate));
-    qA["week"] = qS["week"] = i18n("Week of %1").arg(pd.addDays(1-pd.dayOfWeek()).toString(Qt::ISODate));
+    qA["month"] = qS["month"] = i18n("Month of %1").arg(TQDate(pd.year(),pd.month(),1).toString(TQt::ISODate));
+    qA["week"] = qS["week"] = i18n("Week of %1").arg(pd.addDays(1-pd.dayOfWeek()).toString(TQt::ISODate));
 
     qA["currency"] = qS["currency"] = "";
 
@@ -587,7 +587,7 @@ void QueryTable::constructTransactionTable(void)
           ? i18n("[Empty Payee]")
           : file->payee(payee).name().simplifyWhiteSpace();
 
-        qA["reconciledate"] = (*it_split).reconcileDate().toString(Qt::ISODate);
+        qA["reconciledate"] = (*it_split).reconcileDate().toString(TQt::ISODate);
         qA["reconcileflag"] = KMyMoneyUtils::reconcileStateToString((*it_split).reconcileFlag(), true );
         qA["number"] = (*it_split).number();
 
@@ -814,8 +814,8 @@ void QueryTable::constructTransactionTable(void)
   TQDate startDate, endDate;
 
   report.validDateRange(startDate, endDate);
-  TQString strStartDate = startDate.toString(Qt::ISODate);
-  TQString strEndDate = endDate.toString(Qt::ISODate);
+  TQString strStartDate = startDate.toString(TQt::ISODate);
+  TQString strEndDate = endDate.toString(TQt::ISODate);
   startDate = startDate.addDays(-1);
 
   TQMap<TQString, MyMoneyAccount>::const_iterator it_account, accts_end;
@@ -1208,13 +1208,13 @@ void QueryTable::constructSplitsTable(void)
     TQDate pd;
 
     qA["id"] = qS["id"] = (* it_transaction).id();
-    qA["entrydate"] = qS["entrydate"] = (* it_transaction).entryDate().toString(Qt::ISODate);
-    qA["postdate"] = qS["postdate"] = (* it_transaction).postDate().toString(Qt::ISODate);
+    qA["entrydate"] = qS["entrydate"] = (* it_transaction).entryDate().toString(TQt::ISODate);
+    qA["postdate"] = qS["postdate"] = (* it_transaction).postDate().toString(TQt::ISODate);
     qA["commodity"] = qS["commodity"] = (* it_transaction).commodity();
 
     pd = (* it_transaction).postDate();
-    qA["month"] = qS["month"] = i18n("Month of %1").arg(TQDate(pd.year(),pd.month(),1).toString(Qt::ISODate));
-    qA["week"] = qS["week"] = i18n("Week of %1").arg(pd.addDays(1-pd.dayOfWeek()).toString(Qt::ISODate));
+    qA["month"] = qS["month"] = i18n("Month of %1").arg(TQDate(pd.year(),pd.month(),1).toString(TQt::ISODate));
+    qA["week"] = qS["week"] = i18n("Week of %1").arg(pd.addDays(1-pd.dayOfWeek()).toString(TQt::ISODate));
 
     qA["currency"] = qS["currency"] = "";
 
@@ -1345,7 +1345,7 @@ void QueryTable::constructSplitsTable(void)
           ? i18n("[Empty Payee]")
         : file->payee(payee).name().simplifyWhiteSpace();
 
-      qA["reconciledate"] = (*it_split).reconcileDate().toString(Qt::ISODate);
+      qA["reconciledate"] = (*it_split).reconcileDate().toString(TQt::ISODate);
       qA["reconcileflag"] = KMyMoneyUtils::reconcileStateToString((*it_split).reconcileFlag(), true );
       qA["number"] = (*it_split).number();
 
@@ -1446,8 +1446,8 @@ void QueryTable::constructSplitsTable(void)
   TQDate startDate, endDate;
 
   report.validDateRange(startDate, endDate);
-  TQString strStartDate = startDate.toString(Qt::ISODate);
-  TQString strEndDate = endDate.toString(Qt::ISODate);
+  TQString strStartDate = startDate.toString(TQt::ISODate);
+  TQString strEndDate = endDate.toString(TQt::ISODate);
   startDate = startDate.addDays(-1);
 
   TQMap<TQString, MyMoneyAccount>::const_iterator it_account, accts_end;

kmymoney2/views/kbudgetview.cpp

@@ -233,7 +233,7 @@ void KBudgetView::loadBudgets(void)
   m_budgetValue->clear();
 
   // add the correct years to the drop down list
-  TQDate date = TQDate::currentDate(Qt::LocalTime);
+  TQDate date = TQDate::currentDate(TQt::LocalTime);
   int iStartYear = date.year() - m_iBudgetYearsBack;
 
   m_yearList.clear();

kmymoney2/views/kgloballedgerview.cpp

@@ -619,11 +619,11 @@ void TDEGlobalLedgerView::loadView(void)
 
         if(!t->isScheduled()) {
           if(split.reconcileFlag() == MyMoneySplit::NotReconciled) {
-            tracer.printf("Reducing cleared balance by %s because %s/%s(%s) is not reconciled", (split.shares() * factor).formatMoney("", 2).local8Bit().data(), t->transaction().id().local8Bit().data(), split.id().local8Bit().data(), t->transaction().postDate().toString(Qt::ISODate).local8Bit().data());
+            tracer.printf("Reducing cleared balance by %s because %s/%s(%s) is not reconciled", (split.shares() * factor).formatMoney("", 2).local8Bit().data(), t->transaction().id().local8Bit().data(), split.id().local8Bit().data(), t->transaction().postDate().toString(TQt::ISODate).local8Bit().data());
             clearedBalance[split.accountId()] -= split.shares() * factor;
           }
           if(isReconciliationAccount() && t->transaction().postDate() > reconciliationDate && split.reconcileFlag() == MyMoneySplit::Cleared) {
-            tracer.printf("Reducing cleared balance by %s because we are in reconciliation, %s/%s(%s)'s date is after or on reconciliation date (%s) and is cleared", (split.shares() * factor).formatMoney("", 2).local8Bit().data(), t->transaction().id().local8Bit().data(), split.id().local8Bit().data(), t->transaction().postDate().toString(Qt::ISODate).local8Bit().data(), reconciliationDate.toString(Qt::ISODate).local8Bit().data());
+            tracer.printf("Reducing cleared balance by %s because we are in reconciliation, %s/%s(%s)'s date is after or on reconciliation date (%s) and is cleared", (split.shares() * factor).formatMoney("", 2).local8Bit().data(), t->transaction().id().local8Bit().data(), split.id().local8Bit().data(), t->transaction().postDate().toString(TQt::ISODate).local8Bit().data(), reconciliationDate.toString(TQt::ISODate).local8Bit().data());
 
             clearedBalance[split.accountId()] -= split.shares() * factor;
           }
@@ -638,7 +638,7 @@ void TDEGlobalLedgerView::loadView(void)
           }
 
           if(t->transaction().postDate() > TQDate::currentDate()) {
-            tracer.printf("Reducing actual balance by %s because %s/%s(%s) is in the future", (split.shares() * factor).formatMoney("", 2).local8Bit().data(), t->transaction().id().local8Bit().data(), split.id().local8Bit().data(), t->transaction().postDate().toString(Qt::ISODate).local8Bit().data());
+            tracer.printf("Reducing actual balance by %s because %s/%s(%s) is in the future", (split.shares() * factor).formatMoney("", 2).local8Bit().data(), t->transaction().id().local8Bit().data(), split.id().local8Bit().data(), t->transaction().postDate().toString(TQt::ISODate).local8Bit().data());
             actBalance[split.accountId()] -= split.shares() * factor;
           }
         }

kmymoney2/views/khomeview.cpp

@@ -330,7 +330,7 @@ void KHomeView::showNetWorthGraph(void)
 
     // draw future values in a different line style
   KDChartPropertySet propSetFutureValue("future value", KMM_KDCHART_PROPSET_NORMAL_DATA);
-  propSetFutureValue.setLineStyle(KDChartPropertySet::OwnID, Qt::DotLine);
+  propSetFutureValue.setLineStyle(KDChartPropertySet::OwnID, TQt::DotLine);
   const int idPropFutureValue = chartWidget->params()->registerProperties(propSetFutureValue);
 
   //KDChartPropertySet propSetLastValue("last value", idPropFutureValue);

kmymoney2/widgets/kmymoneyaccountcombo.cpp

@@ -165,7 +165,7 @@ void KMyMoneyAccountCombo::keyPressEvent(TQKeyEvent* k)
 
 void KMyMoneyAccountCombo::mousePressEvent(TQMouseEvent *e)
 {
-  if ( e->button() != Qt::LeftButton ) {
+  if ( e->button() != TQt::LeftButton ) {
     e->ignore();
     return;
   }
@@ -178,7 +178,7 @@ void KMyMoneyAccountCombo::mousePressEvent(TQMouseEvent *e)
 
 void KMyMoneyAccountCombo::mouseReleaseEvent(TQMouseEvent *e)
 {
-  if ( e->button() != Qt::LeftButton ) {
+  if ( e->button() != TQt::LeftButton ) {
       e->ignore();
       return;
   }

kmymoney2/widgets/kmymoneycombo.cpp

@@ -165,7 +165,7 @@ void KMyMoneyCombo::setPaletteBackgroundColor(const TQColor& color)
 void KMyMoneyCombo::mousePressEvent(TQMouseEvent *e)
 {
   // mostly copied from TQCombo::mousePressEvent() and adjusted for our needs
-  if(e->button() != Qt::LeftButton)
+  if(e->button() != TQt::LeftButton)
     return;
 
   if(((!editable() || isInArrowArea(mapToGlobal(e->pos()))) && selector()->itemList().count()) && !m_completion->isVisible()) {

kmymoney2/widgets/register.cpp

@@ -425,7 +425,7 @@ void SimpleDateGroupMarker::paintRegisterCell(TQPainter* painter, int row, int /
     cg.setColor(TQColorGroup::Base, KMyMoneyGlobalSettings::listBGColor());
   TQBrush backgroundBrush(cg.base());
   // backgroundBrush.setStyle(TQt::DiagCrossPattern);
-  backgroundBrush.setStyle(Qt::Dense5Pattern);
+  backgroundBrush.setStyle(TQt::Dense5Pattern);
   backgroundBrush.setColor(KMyMoneyGlobalSettings::listGridColor());
   painter->eraseRect(cellRect);
   painter->fillRect(cellRect, backgroundBrush);
@@ -681,7 +681,7 @@ bool Register::eventFilter(TQObject* o, TQEvent* e)
 {
   if(o == horizontalHeader() && e->type() == TQEvent::MouseButtonPress) {
     TQMouseEvent *me = dynamic_cast<TQMouseEvent*>(e);
-    if(me->button() == Qt::RightButton) {
+    if(me->button() == TQt::RightButton) {
       emit headerClicked();
     }
     // eat up left mouse button press for now
@@ -1590,12 +1590,12 @@ void Register::selectItem(int row, int col, int button, const TQPoint& /* mouseP
     Transaction* t = dynamic_cast<Transaction*>(item);
     if(t) {
       if(!id.isEmpty()) {
-        switch(button & Qt::MouseButtonMask) {
-          case Qt::RightButton:
+        switch(button & TQt::MouseButtonMask) {
+          case TQt::RightButton:
             emit openContextMenu();
             break;
 
-          case Qt::LeftButton:
+          case TQt::LeftButton:
             if(t && col == ReconcileFlagColumn && selectedItemsCount() == 1 && !t->isScheduled())
               emit reconcileStateColumnClicked(t);
             break;
@@ -1659,7 +1659,7 @@ void Register::selectItem(RegisterItem* item, bool dontChangeSelections)
   // kdDebug(2) << "Register::selectItem(" << item << "): type is " << typeid(*item).name() << endl;
 
   TQt::ButtonState buttonState = m_buttonState;
-  m_buttonState = Qt::NoButton;
+  m_buttonState = TQt::NoButton;
 
   if(m_selectionMode == NoSelection)
     return;
@@ -1675,7 +1675,7 @@ void Register::selectItem(RegisterItem* item, bool dontChangeSelections)
         sameEntryType = false;
     }
 
-    if(buttonState & Qt::LeftButton) {
+    if(buttonState & TQt::LeftButton) {
       if(!(buttonState & (TQt::ShiftButton | TQt::ControlButton))) {
         if((cnt != 1) || ((cnt == 1) && !item->isSelected())) {
           emit aboutToSelectItem(item, okToSelect);
@@ -1722,7 +1722,7 @@ void Register::selectItem(RegisterItem* item, bool dontChangeSelections)
             break;
         }
       }
-    } else if(buttonState & Qt::RightButton) {
+    } else if(buttonState & TQt::RightButton) {
       // if the right button is pressed then only change the
       // selection if none of the Shift/Ctrl button is pressed and
       // one of the following conditions is true:
@@ -2181,7 +2181,7 @@ void Register::keyPressEvent(TQKeyEvent* ev)
         // get the state out of the event ...
         m_buttonState = ev->state();
         // ... and pretend that we have pressed the left mouse button ;)
-        m_buttonState = static_cast<TQt::ButtonState>(m_buttonState | Qt::LeftButton);
+        m_buttonState = static_cast<TQt::ButtonState>(m_buttonState | TQt::LeftButton);
         selectItem(m_focusItem);
       }
       break;
@@ -2295,7 +2295,7 @@ void Register::addGroupMarkers(void)
           if(m_account.accountGroup() == MyMoneyAccount::Liability)
             balance = -balance;
           TQString txt = i18n("Online Statement Balance: %1").arg(balance.formatMoney(m_account.fraction()));
-          new KMyMoneyRegister::StatementGroupMarker(this, KMyMoneyRegister::Deposit, TQDate::fromString(m_account.value("lastImportedTransactionDate"), Qt::ISODate), txt);
+          new KMyMoneyRegister::StatementGroupMarker(this, KMyMoneyRegister::Deposit, TQDate::fromString(m_account.value("lastImportedTransactionDate"), TQt::ISODate), txt);
         }
 
         new KMyMoneyRegister::FancyDateGroupMarker(this, thisYear, i18n("This year"));

kmymoney2/widgets/register.h

@@ -332,7 +332,7 @@ public:
 
   /**
     * Select @a item and unselect all others if @a dontChangeSelections
-    * is @a false. If m_buttonState differs from Qt::NoButton (method is
+    * is @a false. If m_buttonState differs from TQt::NoButton (method is
     * called as a result of a mouse button press), then the setting of
     * @a dontChangeSelections has no effect.
     */

kmymoney2/widgets/stdtransactionmatched.cpp

@@ -144,7 +144,7 @@ void StdTransactionMatched::registerCellText(TQString& txt, int& align, int row,
 
           case DetailColumn:
             align |= TQt::AlignLeft;
-            txt = TQString("%1 %2").arg(matchedTransaction.postDate().toString(Qt::ISODate)).arg(matchedTransaction.memo());
+            txt = TQString("%1 %2").arg(matchedTransaction.postDate().toString(TQt::ISODate)).arg(matchedTransaction.memo());
             break;
 
           case PaymentColumn:
@@ -174,7 +174,7 @@ void StdTransactionMatched::registerCellText(TQString& txt, int& align, int row,
             align |= TQt::AlignLeft;
             postDate = m_transaction.postDate();
             if(!m_split.value("kmm-orig-postdate").isEmpty()) {
-              postDate = TQDate::fromString(m_split.value("kmm-orig-postdate"), Qt::ISODate);
+              postDate = TQDate::fromString(m_split.value("kmm-orig-postdate"), TQt::ISODate);
             }
             memo = m_split.memo();
             if(!matchedSplit.memo().isEmpty() && memo != matchedSplit.memo()) {
@@ -187,7 +187,7 @@ void StdTransactionMatched::registerCellText(TQString& txt, int& align, int row,
                 memo.replace('\n', " ");
               }
             }
-            txt = TQString("%1 %2").arg(postDate.toString(Qt::ISODate)).arg(memo);
+            txt = TQString("%1 %2").arg(postDate.toString(TQt::ISODate)).arg(memo);
             break;
 
           case PaymentColumn:

libkdchart/KDChartAxesPainter.cpp

@@ -649,7 +649,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
                                 TQString text;
                                 if( cv.isDateTime ){
                                     TQDateTime dt( TQDateTime::fromString( *it,
-                                                Qt::ISODate ) );
+                                                TQt::ISODate ) );
                                     text = dt.toString( formatDT );
                                 }else{
                                     text = *it;
@@ -1086,7 +1086,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
                 if( nLeaveOut ) {
                     leaveOutGridPen = gridPen;
                     leaveOutGridPen.setWidth( gridLineWidth / 2 );
-                    leaveOutGridPen.setStyle( Qt::DotLine );
+                    leaveOutGridPen.setStyle( TQt::DotLine );
                 }
                 //  =========================================================
                 //  ||  The labels and delimiters and grid printing loops  ||
@@ -1645,7 +1645,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
                         TQDateTime dt;
                         if( cv.isDateTime ){
                             dt = TQDateTime::fromString( *labelIter,
-                                    Qt::ISODate );
+                                    TQt::ISODate );
                             label = dt.toString( formatDT );
                         }else{
                             label = *labelIter;
@@ -3198,9 +3198,9 @@ void KDChartAxesPainter::calculateLabelTexts(
                 nLabels = 0;
                 /*
                    tqDebug("dtLow:  ");
-                   tqDebug(dtLow.toString(  Qt::ISODate ));
+                   tqDebug(dtLow.toString(  TQt::ISODate ));
                    tqDebug("dtHigh: ");
-                   tqDebug(dtHigh.toString( Qt::ISODate ));
+                   tqDebug(dtHigh.toString( TQt::ISODate ));
                    */
                 bool bDone=false;
                 while( !bDone ) {
@@ -3231,7 +3231,7 @@ void KDChartAxesPainter::calculateLabelTexts(
                     if( autoDtLabels )
                         labelTexts.append( "x" );
                     else
-                        labelTexts.append( dt.toString( Qt::ISODate ) );
+                        labelTexts.append( dt.toString( TQt::ISODate ) );
                     bDone = (goDown ? (dt < dtLow ) : (dt > dtHigh));
                     /*if( bDone ){
                       dtHigh = dt;

libkdchart/KDChartAxisParams.cpp

@@ -163,12 +163,12 @@ KDChartAxisParams::KDChartAxisParams()
     _axisShowGrid      = false;
     _axisGridColor     = KDCHART_DEFAULT_AXIS_GRID_COLOR;
     _axisGridLineWidth = KDCHART_AXIS_GRID_AUTO_LINEWIDTH;
-    _axisGridStyle     = Qt::SolidLine;
+    _axisGridStyle     = TQt::SolidLine;
 
     _axisShowSubDelimiters = true;
     _axisGridSubColor      = KDCHART_DEFAULT_AXIS_GRID_COLOR;
     _axisGridSubLineWidth  = KDCHART_AXIS_GRID_AUTO_LINEWIDTH;
-    _axisGridSubStyle      = Qt::DotLine;
+    _axisGridSubStyle      = TQt::DotLine;
 
     _axisZeroLineColor = TQColor( 0x00, 0x00, 0x80 );
 
@@ -1156,14 +1156,14 @@ void  KDChartAxisParams::setAxisGridSubLineWidth( int axisGridSubLineWidth )
   \param axisGridStyle the axis grid line pattern.
   \sa axisGridStyle, setAxisShowGrid
   */
-void  KDChartAxisParams::setAxisGridStyle( Qt::PenStyle axisGridStyle )
+void  KDChartAxisParams::setAxisGridStyle( TQt::PenStyle axisGridStyle )
 {
     _axisGridStyle = axisGridStyle;
     emit changed();
 }
 
 /**
-  \fn Qt::PenStyle  KDChartAxisParams::axisGridStyle() const
+  \fn TQt::PenStyle  KDChartAxisParams::axisGridStyle() const
   Returns the axis grid line pattern.
 
   \return the axis grid line pattern.
@@ -1180,14 +1180,14 @@ void  KDChartAxisParams::setAxisGridStyle( Qt::PenStyle axisGridStyle )
   \sa axisGridSubStyle, setAxisGridStyle, axisGridStyle
   \sa setAxisShowGrid
   */
-void  KDChartAxisParams::setAxisGridSubStyle( Qt::PenStyle axisGridSubStyle )
+void  KDChartAxisParams::setAxisGridSubStyle( TQt::PenStyle axisGridSubStyle )
 {
     _axisGridSubStyle = axisGridSubStyle;
     emit changed();
 }
 
 /**
-  \fn  Qt::PenStyle  KDChartAxisParams::axisGridSubStyle() const
+  \fn  TQt::PenStyle  KDChartAxisParams::axisGridSubStyle() const
   Returns the axis grid line pattern for the thin lines
   showing the sub-delimiter values.
 
@@ -3092,14 +3092,14 @@ KDChartAxisParams::AxisType KDChartAxisParams::stringToAxisType( const TQString&
   */
 
 /**
-  \var  Qt::PenStyle _axisGridStyle
+  \var  TQt::PenStyle _axisGridStyle
   Specifies the axis grid line pattern for main grid lines.
 
   \sa setAxisGridStyle, setAxisShowGrid
   */
 
 /**
-  \var Qt::PenStyle _axisGridSubStyle
+  \var TQt::PenStyle _axisGridSubStyle
   Specifies the axis grid line pattern for sub-delimiter grid lines.
 
   \sa setAxisGridSubStyle, setAxisGridStyle, setAxisShowGrid

libkdchart/KDChartAxisParams.h

@@ -246,8 +246,8 @@ public slots:
     bool axisShowFractionalValuesDelimiters() const { return _axisShowFractionalValuesDelimiters; }
     void setAxisShowGrid( bool axisShowGrid );
     bool axisShowGrid() const { return _axisShowGrid; }
-    void setAxisGridStyle( Qt::PenStyle axisGridStyle );
-    Qt::PenStyle axisGridStyle() const { return _axisGridStyle; }
+    void setAxisGridStyle( TQt::PenStyle axisGridStyle );
+    TQt::PenStyle axisGridStyle() const { return _axisGridStyle; }
     void setAxisGridColor( TQColor axisGridColor );
     TQColor axisGridColor() const { return _axisGridColor; }
     void setAxisGridLineWidth( int axisGridLineWidth );
@@ -255,8 +255,8 @@ public slots:
     // sub grid:
     void setAxisShowSubDelimiters( bool axisShowSubDelimiters );
     bool axisShowSubDelimiters() const { return _axisShowSubDelimiters; }
-    void setAxisGridSubStyle( Qt::PenStyle axisGridSubStyle );
-    Qt::PenStyle axisGridSubStyle() const { return _axisGridSubStyle; }
+    void setAxisGridSubStyle( TQt::PenStyle axisGridSubStyle );
+    TQt::PenStyle axisGridSubStyle() const { return _axisGridSubStyle; }
     void setAxisGridSubColor( TQColor axisGridSubColor );
     TQColor axisGridSubColor() const { return _axisGridSubColor; }
     void setAxisGridSubLineWidth( int axisGridSubLineWidth );
@@ -451,12 +451,12 @@ private:
     bool     _axisShowGrid;
     TQColor   _axisGridColor;
     int      _axisGridLineWidth;
-    Qt::PenStyle _axisGridStyle;
+    TQt::PenStyle _axisGridStyle;
 
     bool     _axisShowSubDelimiters;
     TQColor   _axisGridSubColor;
     int      _axisGridSubLineWidth;
-    Qt::PenStyle _axisGridSubStyle;
+    TQt::PenStyle _axisGridSubStyle;
 
     TQColor _axisZeroLineColor;
     bool _axisLabelsVisible;

libkdchart/KDChartLinesPainter.cpp

@@ -800,7 +800,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
                             // preset with default values
                             int          theLineWidth = default2DPen.width();
                             TQColor       theLineColor = default2DPen.color();
-                            Qt::PenStyle theLineStyle = default2DPen.style();
+                            TQt::PenStyle theLineStyle = default2DPen.style();
                             if( curPropSetId != KDChartPropertySet::UndefinedID ){
                                 // we can safely call the following functions and ignore their
                                 // return values since they will touch the parameters' values

libkdchart/KDChartObjectFactory.cpp

@@ -331,7 +331,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
 
 
     if ( !getNumber( args, 7,&i, "KDChartPropertySet" ) ) return 0;
-    Qt::PenStyle lineStyle = (Qt::PenStyle) i;
+    TQt::PenStyle lineStyle = (TQt::PenStyle) i;
 
     int idShowMarker;
     if ( !getNumber( args, 8,&idShowMarker, "KDChartPropertySet" ) ) return 0;
@@ -373,7 +373,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
     if ( !getNumber( args, 20,&idExtraLinesStyle, "KDChartPropertySet" ) ) return 0;
 
     if ( !getNumber( args, 21,&i, "KDChartPropertySet" ) ) return 0;
-    Qt::PenStyle extraLinesStyle = (Qt::PenStyle) i;
+    TQt::PenStyle extraLinesStyle = (TQt::PenStyle) i;
 
     int idExtraMarkersAlign;
     if ( !getNumber( args, 22,&idExtraMarkersAlign, "KDChartPropertySet" ) ) return 0;

libkdchart/KDChartPainter.cpp

@@ -1341,7 +1341,7 @@ void KDChartPainter::calculateHorizontalLegendSize( TQPainter* painter,
 bool KDChartPainter::mustDrawVerticalLegend() const
 {
     return
-        params()->legendOrientation() == Qt::Vertical ||
+        params()->legendOrientation() == TQt::Vertical ||
         params()->legendPosition() == KDChartParams::LegendLeft ||
         params()->legendPosition() == KDChartParams::LegendRight ||
         params()->legendPosition() == KDChartParams::LegendTopLeft ||
@@ -2870,7 +2870,7 @@ void KDChartPainter::drawExtraLinesAndMarkers(
             int          extraLinesLength = -20;
             int          extraLinesWidth = defaultPen.width();
             TQColor       extraLinesColor = defaultPen.color();
-            Qt::PenStyle extraLinesStyle = defaultPen.style();
+            TQt::PenStyle extraLinesStyle = defaultPen.style();
             uint         extraMarkersAlign = 0;
             propSet.hasOwnExtraLinesLength( iDummy, extraLinesLength );
             propSet.hasOwnExtraLinesWidth(  iDummy, extraLinesWidth  );

libkdchart/KDChartParams.cpp

@@ -144,7 +144,7 @@ KDChartParams::KDChartParams()
     setShadowBrightnessFactor( 1.0 );
 
     // The default shadow fill style.
-    setShadowPattern( Qt::SolidPattern );
+    setShadowPattern( TQt::SolidPattern );
 
     // Some default colors for the data.
     setDataDefaultColors();
@@ -156,7 +156,7 @@ KDChartParams::KDChartParams()
     setOutlineDataLineWidth( 1 );
 
     // Default line style for data display outlines.
-    setOutlineDataLineStyle( Qt::SolidLine );
+    setOutlineDataLineStyle( TQt::SolidLine );
 
     // END GENERAL
 
@@ -215,7 +215,7 @@ KDChartParams::KDChartParams()
     setLineWidth( 1 );
 
     // Lines are solid by default
-    setLineStyle( Qt::SolidLine );
+    setLineStyle( TQt::SolidLine );
 
     // Lines have the same color as their
     // respective data points by default
@@ -338,8 +338,8 @@ KDChartParams::KDChartParams()
     setLegendSpacing( 20 );
     // Position of the legend
     setLegendPosition( LegendRight );
-    // Qt::Orientation of the legend
-    setLegendOrientation( Qt::Vertical );
+    // Orientation of the legend
+    setLegendOrientation( TQt::Vertical );
     // Whether the legend shall show lines or just
     // show the markers (or squares, resp.)
     setLegendShowLines( false );
@@ -432,7 +432,7 @@ KDChartParams::KDChartParams()
     setProperties(KDCHART_PROPSET_NORMAL_DATA, *tempPropSetA);
     // don't show the line, don't show the marker
     tempPropSetA->setName("transparent data");
-    tempPropSetA->setLineStyle(  KDChartPropertySet::OwnID, Qt::NoPen );
+    tempPropSetA->setLineStyle(  KDChartPropertySet::OwnID, TQt::NoPen );
     tempPropSetA->setShowMarker( KDChartPropertySet::OwnID, false );
     setProperties(KDCHART_PROPSET_TRANSPARENT_DATA, *tempPropSetA);
     // don't show line nor marker, but do show the horizontal line
@@ -635,7 +635,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
     if( bOk ){
         int          lineWidth;
         TQColor       lineColor;
-        Qt::PenStyle lineStyle;
+        TQt::PenStyle lineStyle;
         bool         showMarker;
         uint         markerAlign;
         TQSize        markerSize;
@@ -646,7 +646,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
         int          extraLinesLength;
         int          extraLinesWidth;
         TQColor       extraLinesColor;
-        Qt::PenStyle extraLinesStyle;
+        TQt::PenStyle extraLinesStyle;
         uint         extraMarkersAlign;
         TQSize        extraMarkersSize;
         TQColor       extraMarkersColor;
@@ -1301,7 +1301,7 @@ void KDChartParams::setPrintDataValues( bool active,
                 else
                     settings->_dataValuesColor = *color;
             }
-            settings->_dataValuesBrush = TQBrush(Qt::NoBrush);
+            settings->_dataValuesBrush = TQBrush(TQt::NoBrush);
             // for values below zero:
             settings->_dataValuesAnchorNegativePosition = negativePosition;
             settings->_dataValuesAnchorNegativeAlign    = negativeAlign;
@@ -3092,7 +3092,7 @@ void KDChartParams::setAdditionalChartType( ChartType chartType )
 
 
 /**
-  \fn void KDChartParams::setShadowPattern( Qt::BrushStyle style )
+  \fn void KDChartParams::setShadowPattern( TQt::BrushStyle style )
 
   Specifies a filling style for filling the shadow areas in
   3-dimensional drawings like 3D bar charts. The default is to
@@ -3106,7 +3106,7 @@ void KDChartParams::setAdditionalChartType( ChartType chartType )
 
 
 /**
-  \fn Qt::BrushStyle KDChartParams::shadowPattern() const
+  \fn TQt::BrushStyle KDChartParams::shadowPattern() const
 
   Returns the filling style used for filling the shadow areas in
   3-dimensional drawings like 3D bar charts. The default is to
@@ -4862,7 +4862,7 @@ void KDChartParams::setLineMarkerStyles( LineMarkerStyleMap map ) {
   \sa lineStyle, setLineWidth, setLineColor
   \sa setLineMarker, setLineMarkerSize, setLineMarkerStyle
   */
-void KDChartParams::setLineStyle( Qt::PenStyle style, uint dataset )
+void KDChartParams::setLineStyle( TQt::PenStyle style, uint dataset )
 {
     if( KDCHART_GLOBAL_LINE_STYLE == dataset )
         _lineStyle = style;
@@ -4885,7 +4885,7 @@ void KDChartParams::setLineStyle( Qt::PenStyle style, uint dataset )
   \return the line style for the specified data set
   \sa setLineStyle, setLineMarkerStyle
   */
-Qt::PenStyle KDChartParams::lineStyle( uint dataset ) const
+TQt::PenStyle KDChartParams::lineStyle( uint dataset ) const
 {
     if( KDCHART_GLOBAL_LINE_STYLE == dataset )
         // global line style
@@ -6668,10 +6668,10 @@ void KDChartParams::setBWChartPrintStatistics( BWStatVal statValue,
 
 
 /**
-  \fn void KDChartParams::setLegendOrientation( Qt::Orientation orientation )
+  \fn void KDChartParams::setLegendOrientation( TQt::Orientation orientation )
 
-  Specifies how the legend should be printed. Qt::Vertical (the default)
-  prints the legend entries below each other, Qt::Horizontal prints them
+  Specifies how the legend should be printed. TQt::Vertical (the default)
+  prints the legend entries below each other, TQt::Horizontal prints them
   aside each other.
 
   \note Horizontal orientation is only possible if the chart is NOT making
@@ -6686,7 +6686,7 @@ void KDChartParams::setBWChartPrintStatistics( BWStatVal statValue,
 
 
 /**
-  \fn Qt::Orientation KDChartParams::legendOrientation() const
+  \fn TQt::Orientation KDChartParams::legendOrientation() const
 
   Returns how the legend will be printed.
 
@@ -8428,7 +8428,7 @@ int KDChartParams::headerFooterFontRelSize( uint pos ) const
 
 
 /**
-  \var Qt::BrushStyle KDChartParams::_shadowPattern;
+  \var TQt::BrushStyle KDChartParams::_shadowPattern;
 
   Stores a fill style to be used for filling shadow area in
   3-dimensional drawings like e.g. 3D bar charts.
@@ -9238,7 +9238,7 @@ void KDChartParams::insertDefaultAxisTitleBox( uint n,
                                 0, 0,
                                 0, 0,
                                 setColor ? axisTitleColor : TQt::darkBlue,
-                                Qt::NoBrush,
+                                TQt::NoBrush,
                                 KDChartEnums::AreaAxisBASE + n,
                                 bVert ? KDChartEnums::PosCenterLeft        : KDChartEnums::PosBottomCenter,                                                         bVert ? (TQt::AlignTop + TQt::AlignHCenter)  : (TQt::AlignBottom + TQt::AlignHCenter),
                                 0,0,0,

libkdchart/KDChartParams.h

@@ -633,12 +633,12 @@ public slots:
         }
 
 
-    void setShadowPattern( Qt::BrushStyle style ) {
+    void setShadowPattern( TQt::BrushStyle style ) {
         _shadowPattern = style;
         emit changed();
     }
 
-    Qt::BrushStyle shadowPattern() const {
+    TQt::BrushStyle shadowPattern() const {
         return _shadowPattern;
     }
 
@@ -668,13 +668,13 @@ public slots:
         }
 
 
-    void setOutlineDataLineStyle( Qt::PenStyle style )
+    void setOutlineDataLineStyle( TQt::PenStyle style )
         {
             _outlineDataLineStyle = style;
             emit changed();
         }
 
-    Qt::PenStyle outlineDataLineStyle() const
+    TQt::PenStyle outlineDataLineStyle() const
         {
             return _outlineDataLineStyle;
         }
@@ -749,7 +749,7 @@ public slots:
                                uint chart = KDCHART_ALL_CHARTS );
 
     void setDataValuesColors( const TQColor* color = KDCHART_DATA_VALUE_AUTO_COLOR,
-                              const TQBrush& background = TQBrush(Qt::NoBrush),
+                              const TQBrush& background = TQBrush(TQt::NoBrush),
                               uint chart = KDCHART_ALL_CHARTS );
 
     // Note if you change the parameters here, then you must also change them in wrappers/KDChartParametersWrapper.h
@@ -1150,9 +1150,9 @@ public slots:
             return _lineColor;
         }
 
-    void setLineStyle( Qt::PenStyle style, uint dataset=KDCHART_GLOBAL_LINE_STYLE );
+    void setLineStyle( TQt::PenStyle style, uint dataset=KDCHART_GLOBAL_LINE_STYLE );
 
-    Qt::PenStyle lineStyle( uint dataset=KDCHART_GLOBAL_LINE_STYLE ) const;
+    TQt::PenStyle lineStyle( uint dataset=KDCHART_GLOBAL_LINE_STYLE ) const;
 
 
     void setThreeDLines( bool threeD ) {
@@ -1866,13 +1866,13 @@ public slots:
             return _legendPosition;
         }
 
-    void setLegendOrientation( Qt::Orientation orientation )
+    void setLegendOrientation( TQt::Orientation orientation )
         {
             _legendOrientation = orientation;
             emit changed();
         }
 
-    Qt::Orientation legendOrientation() const
+    TQt::Orientation legendOrientation() const
         {
             return _legendOrientation;
         }
@@ -2543,14 +2543,14 @@ private:
     uint _maxDatasetSourceMode;
     KDChartPropertySetList _propertySetList;
     double _shadowBrightnessFactor;
-    Qt::BrushStyle _shadowPattern;
+    TQt::BrushStyle _shadowPattern;
     bool _threeDShadowColors;
     uint _maxDatasetColor;
     TQMap < uint, TQColor > _dataColorsShadow1;
     TQMap < uint, TQColor > _dataColorsShadow2;
     TQColor _outlineDataColor;
     uint _outlineDataLineWidth;
-    Qt::PenStyle _outlineDataLineStyle;
+    TQt::PenStyle _outlineDataLineStyle;
 
 
     struct PrintDataValuesSettings {
@@ -2612,8 +2612,8 @@ private:
     TQSize _lineMarkerSize;
     TQColor _lineColor;
     int _lineWidth;
-    Qt::PenStyle _lineStyle;
-    typedef TQMap<uint, Qt::PenStyle> LineStyleMap;
+    TQt::PenStyle _lineStyle;
+    typedef TQMap<uint, TQt::PenStyle> LineStyleMap;
     LineStyleMap _datasetLineStyles;
     AreaChartSubType _areaChartSubType;
     AreaLocation _areaLocation;
@@ -2700,7 +2700,7 @@ private:
     // LEGENDS
 
     LegendPosition _legendPosition;
-    Qt::Orientation _legendOrientation;
+    TQt::Orientation _legendOrientation;
     bool _legendShowLines;
     LegendSource _legendSource;
     TQMap < int, TQString > _legendText;

libkdchart/KDChartParams_io.cpp

@@ -545,7 +545,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const
                 KDXML::penStyleToString( _lineStyle ) );
 
         // the DatasetLineStyles elements
-        {for( TQMap<uint,  Qt::PenStyle>::ConstIterator it = _datasetLineStyles.begin();
+        {for( TQMap<uint,  TQt::PenStyle>::ConstIterator it = _datasetLineStyles.begin();
                 it != _datasetLineStyles.end(); ++it ) {
             TQDomElement lineStyleElement = doc.createElement( "DatasetLineStyle" );
             lineSettingsElement.appendChild( lineStyleElement );
@@ -789,7 +789,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const
         KDXML::createStringNode( doc, legendSettingsElement, "Position",
                 KDChartParams::legendPositionToString( _legendPosition ) );
 
-        // the Qt::Orientation element
+        // the Orientation element
         KDXML::createOrientationNode( doc, legendSettingsElement,
                                       "Orientation", _legendOrientation );
 
@@ -1577,7 +1577,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
                         } else if( tagName == "DatasetLineStyle" ) {
                             bool ok = true;
                             uint dataset;
-                            Qt::PenStyle style = Qt::SolidLine;
+                            TQt::PenStyle style = TQt::SolidLine;
                             if( element.hasAttribute( "Dataset" ) &&
                                 element.hasAttribute( "Style" ) ) {
                                 dataset = element.attribute( "Dataset" ).toUInt( &ok );
@@ -1885,7 +1885,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
                             if( KDXML::readStringNode( element, string ) )
                                 _legendPosition = KDChartParams::stringToLegendPosition( string );
                         } else if( tagName == "Orientation" ) {
-                            Qt::Orientation value=Qt::Vertical;
+                            TQt::Orientation value=TQt::Vertical;
                             if( KDXML::readOrientationNode( element, value ) )
                                 _legendOrientation = value;
                         } else if( tagName == "ShowLines" ) {
@@ -2316,7 +2316,7 @@ void dataCoordToElementAttr(const TQVariant& val, TQDomElement& element, const T
         element.setAttribute( "StringValue"+postfix, val.toString() );
     else if( TQVariant::DateTime == val.type() )
         element.setAttribute( "DateTimeValue"+postfix,
-                              val.toDateTime().toString( Qt::ISODate ) );
+                              val.toDateTime().toString( TQt::ISODate ) );
     else
         element.setAttribute( "NoValue"+postfix, "true" );
 }

libkdchart/KDChartPropertySet.cpp

@@ -122,7 +122,7 @@ void KDChartPropertySet::fillValueMembersWithDummyValues()
     // fill with dummy values to avoid problems when saving us into a stream
     mLineWidth         = 1;
     mLineColor         = TQt::black;
-    mLineStyle         = Qt::SolidLine;
+    mLineStyle         = TQt::SolidLine;
     mShowMarker        = true;
     mMarkerAlign       = TQt::AlignCenter;
     mMarkerSize        = TQSize(6,6);
@@ -133,7 +133,7 @@ void KDChartPropertySet::fillValueMembersWithDummyValues()
     mExtraLinesLength  = -20;
     mExtraLinesWidth   = 1;
     mExtraLinesColor   = TQt::black;
-    mExtraLinesStyle   = Qt::SolidLine;
+    mExtraLinesStyle   = TQt::SolidLine;
     mExtraMarkersAlign = TQt::AlignLeft|TQt::AlignTop;
     mExtraMarkersSize  = TQSize(6,6);
     mExtraMarkersColor = TQt::black;

libkdchart/KDChartPropertySet.h

@@ -521,7 +521,7 @@ public slots:
       \sa setLineWidth, setLineColor, setShowMarker
       \sa hasOwnLineWidth, hasOwnLineColor, hasOwnLineStyle, hasOwnShowMarker
       */
-    void setLineStyle( int idLineStyle, const Qt::PenStyle& lineStyle )
+    void setLineStyle( int idLineStyle, const TQt::PenStyle& lineStyle )
     {
         mIdLineStyle = idLineStyle;
         mLineStyle =   lineStyle;
@@ -559,7 +559,7 @@ public slots:
       \sa setLineWidth, setLineColor, setLineStyle, setShowMarker
       \sa hasOwnLineWidth, hasOwnLineColor, hasOwnShowMarker
       */
-    bool hasOwnLineStyle( int& idLineStyle, Qt::PenStyle& lineStyle )
+    bool hasOwnLineStyle( int& idLineStyle, TQt::PenStyle& lineStyle )
     {
         idLineStyle = mIdLineStyle;
         if( OwnID == mIdLineStyle ){
@@ -877,12 +877,12 @@ public slots:
         }
         return false;
     }
-    void setExtraLinesStyle( int idExtraLinesStyle, const Qt::PenStyle extraLinesStyle )
+    void setExtraLinesStyle( int idExtraLinesStyle, const TQt::PenStyle extraLinesStyle )
     {
         mIdExtraLinesStyle = idExtraLinesStyle;
         mExtraLinesStyle =   extraLinesStyle;
     }
-    bool hasOwnExtraLinesStyle( int& idExtraLinesStyle, Qt::PenStyle& extraLinesStyle )
+    bool hasOwnExtraLinesStyle( int& idExtraLinesStyle, TQt::PenStyle& extraLinesStyle )
     {
         idExtraLinesStyle = mIdExtraLinesStyle;
         if( OwnID == idExtraLinesStyle ){
@@ -961,7 +961,7 @@ private:
     // IDs:                     values used if ID == OwnID:
     int mIdLineWidth;         int          mLineWidth;
     int mIdLineColor;         TQColor       mLineColor;
-    int mIdLineStyle;         Qt::PenStyle mLineStyle;
+    int mIdLineStyle;         TQt::PenStyle mLineStyle;
     int mIdShowMarker;        bool         mShowMarker;
     int mIdMarkerSize;        TQSize        mMarkerSize;
     int mIdMarkerColor;       TQColor       mMarkerColor;
@@ -972,7 +972,7 @@ private:
     int mIdExtraLinesLength;  int          mExtraLinesLength;
     int mIdExtraLinesWidth;   int          mExtraLinesWidth;
     int mIdExtraLinesColor;   TQColor       mExtraLinesColor;
-    int mIdExtraLinesStyle;   Qt::PenStyle mExtraLinesStyle;
+    int mIdExtraLinesStyle;   TQt::PenStyle mExtraLinesStyle;
     int mIdExtraMarkersAlign; uint         mExtraMarkersAlign;
     int mIdExtraMarkersSize;  TQSize        mExtraMarkersSize;
     int mIdExtraMarkersColor; TQColor       mExtraMarkersColor;

libkdchart/KDChartWidget.cpp

@@ -175,10 +175,10 @@ void KDChartWidget::mousePressEvent( TQMouseEvent* event )
     //while ( ( current = it.current() ) ) {
         if ( current->contains( event->pos() ) ) {
             _mousePressedOnRegion = current;
-            if ( event->button() == Qt::LeftButton ){
+            if ( event->button() == TQt::LeftButton ){
                 emit dataLeftPressed( current->row, current->col );
                 emit dataLeftPressed( event->pos() );
-            }else if ( event->button() == Qt::MidButton ){
+            }else if ( event->button() == TQt::MidButton ){
                 emit dataMiddlePressed( current->row, current->col );
                 emit dataMiddlePressed( event->pos() );
             }else{
@@ -204,14 +204,14 @@ void KDChartWidget::mouseReleaseEvent( TQMouseEvent* event )
     while ( ( current = it.current() ) ) {
         ++it;
         if ( current->contains( event->pos() ) ) {
-            if ( event->button() == Qt::LeftButton ) {
+            if ( event->button() == TQt::LeftButton ) {
                 emit dataLeftReleased( current->row, current->col );
                 emit dataLeftReleased( event->pos() );
                 if ( _mousePressedOnRegion == current ){
                     emit dataLeftClicked( current->row, current->col );
                     emit dataLeftClicked( event->pos() );
                 }
-            } else if ( event->button() == Qt::MidButton ) {
+            } else if ( event->button() == TQt::MidButton ) {
                 emit dataMiddleReleased( current->row, current->col );
                 emit dataMiddleReleased( event->pos() );
                 if ( _mousePressedOnRegion == current ){

libkdchart/KDXMLTools.cpp

@@ -51,13 +51,13 @@ namespace KDXML {
 
 
     void createOrientationNode( TQDomDocument& doc, TQDomNode& parent,
-            const TQString& elementName, Qt::Orientation value )
+            const TQString& elementName, TQt::Orientation value )
     {
         TQDomElement newElement =
             doc.createElement( elementName );
         parent.appendChild( newElement );
         TQDomText elementContent =
-            doc.createTextNode( (Qt::Vertical == value) ? "vertical" : "horizontal" );
+            doc.createTextNode( (TQt::Vertical == value) ? "vertical" : "horizontal" );
         newElement.appendChild( elementContent );
     }
 
@@ -279,7 +279,7 @@ namespace KDXML {
     }
 
 
-    TQString penStyleToString( Qt::PenStyle style )
+    TQString penStyleToString( TQt::PenStyle style )
     {
         switch( style ) {
             case TQt::NoPen:
@@ -301,39 +301,39 @@ namespace KDXML {
 
 
 
-    TQString brushStyleToString( Qt::BrushStyle style )
+    TQString brushStyleToString( TQt::BrushStyle style )
     {
         // PENDING(kalle) Support custom patterns
         switch( style ) {
-            case Qt::NoBrush:
+            case TQt::NoBrush:
                 return "NoBrush";
-            case Qt::SolidPattern:
+            case TQt::SolidPattern:
                 return "SolidPattern";
-            case Qt::Dense1Pattern:
+            case TQt::Dense1Pattern:
                 return "Dense1Pattern";
-            case Qt::Dense2Pattern:
+            case TQt::Dense2Pattern:
                 return "Dense2Pattern";
-            case Qt::Dense3Pattern:
+            case TQt::Dense3Pattern:
                 return "Dense3Pattern";
-            case Qt::Dense4Pattern:
+            case TQt::Dense4Pattern:
                 return "Dense4Pattern";
-            case Qt::Dense5Pattern:
+            case TQt::Dense5Pattern:
                 return "Dense5Pattern";
-            case Qt::Dense6Pattern:
+            case TQt::Dense6Pattern:
                 return "Dense6Pattern";
-            case Qt::Dense7Pattern:
+            case TQt::Dense7Pattern:
                 return "Dense7Pattern";
-            case Qt::HorPattern:
+            case TQt::HorPattern:
                 return "HorPattern";
-            case Qt::VerPattern:
+            case TQt::VerPattern:
                 return "VerPattern";
-            case Qt::CrossPattern:
+            case TQt::CrossPattern:
                 return "CrossPattern";
-            case Qt::BDiagPattern:
+            case TQt::BDiagPattern:
                 return "BDiagPattern";
-            case Qt::FDiagPattern:
+            case TQt::FDiagPattern:
                 return "FDiagPattern";
-            case Qt::DiagCrossPattern:
+            case TQt::DiagCrossPattern:
                 return "DiagCrossPattern";
             default: // should not happen (but can for a custom pattern)
                 return "SolidPattern";
@@ -381,13 +381,13 @@ namespace KDXML {
     }
 
 
-    bool readOrientationNode( const TQDomElement& element, Qt::Orientation& value )
+    bool readOrientationNode( const TQDomElement& element, TQt::Orientation& value )
     {
         if( element.text() == "vertical" ) {
-            value = Qt::Vertical;
+            value = TQt::Vertical;
             return true;
         } else if( element.text() == "horizontal" ) {
-            value = Qt::Horizontal;
+            value = TQt::Horizontal;
             return true;
         } else
             return false;
@@ -443,7 +443,7 @@ namespace KDXML {
     {
         bool ok = true;
         TQColor tempColor;
-        Qt::BrushStyle tempStyle=Qt::SolidPattern;
+        TQt::BrushStyle tempStyle=TQt::SolidPattern;
         TQPixmap tempPixmap;
         TQDomNode node = element.firstChild();
         while( !node.isNull() ) {
@@ -551,7 +551,7 @@ namespace KDXML {
         bool ok = true;
         int tempWidth;
         TQColor tempColor;
-        Qt::PenStyle tempStyle=Qt::SolidLine;
+        TQt::PenStyle tempStyle=TQt::SolidLine;
         TQDomNode node = element.firstChild();
         while( !node.isNull() ) {
             TQDomElement element = node.toElement();
@@ -747,60 +747,60 @@ namespace KDXML {
 
 
 
-    Qt::PenStyle stringToPenStyle( const TQString& style )
+    TQt::PenStyle stringToPenStyle( const TQString& style )
     {
         if( style == "NoPen" )
-            return Qt::NoPen;
+            return TQt::NoPen;
         else if( style == "SolidLine" )
-            return Qt::SolidLine;
+            return TQt::SolidLine;
         else if( style == "DashLine" )
-            return Qt::DashLine;
+            return TQt::DashLine;
         else if( style == "DotLine" )
-            return Qt::DotLine;
+            return TQt::DotLine;
         else if( style == "DashDotLine" )
-            return Qt::DashDotLine;
+            return TQt::DashDotLine;
         else if( style == "DashDotDotLine" )
-            return Qt::DashDotDotLine;
+            return TQt::DashDotDotLine;
         else // should not happen
-            return Qt::SolidLine;
+            return TQt::SolidLine;
     }
 
 
-    Qt::BrushStyle stringToBrushStyle( const TQString& style )
+    TQt::BrushStyle stringToBrushStyle( const TQString& style )
     {
         // PENDING(kalle) Support custom patterns
         if( style == "NoBrush" )
-            return Qt::NoBrush;
+            return TQt::NoBrush;
         else if( style == "SolidPattern" )
-            return Qt::SolidPattern;
+            return TQt::SolidPattern;
         else if( style == "Dense1Pattern" )
-            return Qt::Dense1Pattern;
+            return TQt::Dense1Pattern;
         else if( style == "Dense2Pattern" )
-            return Qt::Dense2Pattern;
+            return TQt::Dense2Pattern;
         else if( style == "Dense3Pattern" )
-            return Qt::Dense3Pattern;
+            return TQt::Dense3Pattern;
         else if( style == "Dense4Pattern" )
-            return Qt::Dense4Pattern;
+            return TQt::Dense4Pattern;
         else if( style == "Dense5Pattern" )
-            return Qt::Dense5Pattern;
+            return TQt::Dense5Pattern;
         else if( style == "Dense6Pattern" )
-            return Qt::Dense6Pattern;
+            return TQt::Dense6Pattern;
         else if( style == "Dense7Pattern" )
-            return Qt::Dense7Pattern;
+            return TQt::Dense7Pattern;
         else if( style == "HorPattern" )
-            return Qt::HorPattern;
+            return TQt::HorPattern;
         else if( style == "VerPattern" )
-            return Qt::VerPattern;
+            return TQt::VerPattern;
         else if( style == "CrossPattern" )
-            return Qt::CrossPattern;
+            return TQt::CrossPattern;
         else if( style == "BDiagPattern" )
-            return Qt::BDiagPattern;
+            return TQt::BDiagPattern;
         else if( style == "FDiagPattern" )
-            return Qt::FDiagPattern;
+            return TQt::FDiagPattern;
         else if( style == "DiagCrossPattern" )
-            return Qt::DiagCrossPattern;
+            return TQt::DiagCrossPattern;
         else // should not happen (but can with custom patterns)
-            return Qt::SolidPattern;
+            return TQt::SolidPattern;
     }
 
 }

libkdchart/KDXMLTools.h

@@ -44,15 +44,15 @@
 #include <tqdatetime.h>
 
 namespace KDXML {
-    TQString penStyleToString( Qt::PenStyle style );
-    Qt::PenStyle stringToPenStyle( const TQString& style );
-    TQString brushStyleToString( Qt::BrushStyle style );
-    Qt::BrushStyle stringToBrushStyle( const TQString& style );
+    TQString penStyleToString( TQt::PenStyle style );
+    TQt::PenStyle stringToPenStyle( const TQString& style );
+    TQString brushStyleToString( TQt::BrushStyle style );
+    TQt::BrushStyle stringToBrushStyle( const TQString& style );
 
     void createBoolNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, bool value );
     void createOrientationNode( TQDomDocument& doc, TQDomNode& parent,
-            const TQString& elementName, Qt::Orientation value );
+            const TQString& elementName, TQt::Orientation value );
     void createSizeNode( TQDomDocument& doc, TQDomNode& parent,
             const TQString& elementName, const TQSize& value );
     void createIntNode( TQDomDocument& doc, TQDomNode& parent,
@@ -89,7 +89,7 @@ namespace KDXML {
     bool readStringNode( const TQDomElement& element, TQString& value );
     bool readDoubleNode( const TQDomElement& element, double& value );
     bool readBoolNode( const TQDomElement& element, bool& value );
-    bool readOrientationNode( const TQDomElement& element, Qt::Orientation& value );
+    bool readOrientationNode( const TQDomElement& element, TQt::Orientation& value );
     bool readSizeNode( const TQDomElement& element, TQSize& value );
     bool readColorNode( const TQDomElement& element, TQColor& value );
     bool readBrushNode( const TQDomElement& element, TQBrush& brush );

libkgpgfile/kgpgfile.cpp

@@ -565,7 +565,7 @@ void KGPGFile::publicKeyList(TQStringList& list, const TQString& pattern)
     TQStringList fields = TQStringList::split(":", (*it), true);
     TQString val;
     if(fields[0] == "pub") {
-      TQDate expiration = TQDate::fromString(fields[6], Qt::ISODate);
+      TQDate expiration = TQDate::fromString(fields[6], TQt::ISODate);
       if(expiration >  TQDate::currentDate()) {
         currentKey = fields[4];
         val = TQString("%1:%2").arg(currentKey).arg(fields[9]);

translations/messages/it.po

@@ -15159,8 +15159,8 @@ msgstr ""
 #~ msgstr "PriceInfo"
 
 #~ msgctxt "Duplicate split"
-#~ msgid "Qt::CTRL+c"
-#~ msgstr "Qt::CTRL+c"
+#~ msgid "Ctrl+c"
+#~ msgstr "Ctrl+c"
 
 #~ msgctxt "Split transaction (category replacement)"
 #~ msgid "Split transaction"