Rename a number of old tq methods that are no longer tq specific

1 files changed, 26 insertions, 26 deletions

diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp
index 87f8890..e9a758e 100644
--- a/kmymoney2/views/kgloballedgerview.cpp
+++ b/kmymoney2/views/kgloballedgerview.cpp
@@ -21,7 +21,7 @@
 // QT Includes
 
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 
 // ----------------------------------------------------------------------------
@@ -176,14 +176,14 @@ KGlobalLedgerView::KGlobalLedgerView(TQWidget *parent, const char *name )
   //m_toolbar->setMaximumSize(50,20);
   m_toolbar->alignItemRight(1);
 #endif
-  m_toolbar->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
-  tqlayout()->addWidget(m_toolbarFrame);
+  m_toolbar->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+  layout()->addWidget(m_toolbarFrame);
 
   // create the register frame
   m_registerFrame = new TQFrame(this);
   TQVBoxLayout* registerFrameLayout = new TQVBoxLayout(m_registerFrame, 0, 0);
-  tqlayout()->addWidget(m_registerFrame);
-  tqlayout()->setStretchFactor(m_registerFrame, 2);
+  layout()->addWidget(m_registerFrame);
+  layout()->setStretchFactor(m_registerFrame, 2);
   m_register = new KMyMoneyRegister::Register(m_registerFrame);
   registerFrameLayout->addWidget(m_register);
   m_register->installEventFilter(this);
@@ -210,12 +210,12 @@ KGlobalLedgerView::KGlobalLedgerView(TQWidget *parent, const char *name )
   spacer = new TQSpacerItem( 20, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
   summaryFrameLayout->addItem(spacer);
   summaryFrameLayout->addWidget(m_rightSummaryLabel);
-  tqlayout()->addWidget(m_summaryFrame);
+  layout()->addWidget(m_summaryFrame);
 
   // create the button frame
   m_buttonFrame = new TQFrame(this);
   TQVBoxLayout* buttonLayout = new TQVBoxLayout(m_buttonFrame, 0, 0);
-  tqlayout()->addWidget(m_buttonFrame);
+  layout()->addWidget(m_buttonFrame);
   m_buttonbar = new KToolBar(m_buttonFrame, 0, true);
   m_buttonbar->setIconText(KToolBar::IconTextRight);
   buttonLayout->addWidget(m_buttonbar);
@@ -236,7 +236,7 @@ KGlobalLedgerView::KGlobalLedgerView(TQWidget *parent, const char *name )
   frameLayout->addWidget(m_form);
   m_formFrame->setFrameShape( TQFrame::Panel );
   m_formFrame->setFrameShadow( TQFrame::Raised );
-  tqlayout()->addWidget(m_formFrame);
+  layout()->addWidget(m_formFrame);
 
   connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadView()));
   connect(m_register, TQT_SIGNAL(focusChanged(KMyMoneyRegister::Transaction*)), m_form, TQT_SLOT(slotSetTransaction(KMyMoneyRegister::Transaction*)));
@@ -448,7 +448,7 @@ void KGlobalLedgerView::loadView(void)
       // show scheduled transactions which have a scheduled postdate
       // within the next 'period' days. In reconciliation mode, the
       // period starts on the statement date.
-      TQDate endDate = TQDate::tqcurrentDate().addDays(period);
+      TQDate endDate = TQDate::currentDate().addDays(period);
       if(isReconciliationAccount())
         endDate = reconciliationDate.addDays(period);
       TQValueList<MyMoneySchedule> scheduleList = MyMoneyFile::instance()->scheduleList(m_account.id());
@@ -464,7 +464,7 @@ void KGlobalLedgerView::loadView(void)
           // certainly be posted in the past. So we take todays date
           // as the alternative
           if(s.isOverdue())
-            t.setPostDate(TQDate::tqcurrentDate());
+            t.setPostDate(TQDate::currentDate());
           else
             t.setPostDate(s.adjustedNextDueDate());
           const TQValueList<MyMoneySplit>& splits = t.splits();
@@ -476,7 +476,7 @@ void KGlobalLedgerView::loadView(void)
           }
           // keep track of this payment locally (not in the engine)
           if(s.isOverdue())
-            s.setLastPayment(TQDate::tqcurrentDate());
+            s.setLastPayment(TQDate::currentDate());
           else
             s.setLastPayment(s.nextDueDate());
 
@@ -629,7 +629,7 @@ void KGlobalLedgerView::loadView(void)
             }
           }
 
-          if(t->transaction().postDate() > TQDate::tqcurrentDate()) {
+          if(t->transaction().postDate() > TQDate::currentDate()) {
             tracer.printf("Reducing actual balance by %s because %s/%s(%s) is in the future", (split.shares() * factor).formatMoney("", 2).data(), t->transaction().id().data(), split.id().data(), t->transaction().postDate().toString(Qt::ISODate).data());
             actBalance[split.accountId()] -= split.shares() * factor;
           }
@@ -652,11 +652,11 @@ void KGlobalLedgerView::loadView(void)
           arg(paymentAmount[m_account.id()].abs().formatMoney(m_account.fraction())) );
     }
     if(pStatement) {
-      pStatement->setText(i18n("%1 payments (%2)").tqarg(payments[m_account.id()]).
+      pStatement->setText(i18n("%1 payments (%2)").arg(payments[m_account.id()]).
           arg(paymentAmount[m_account.id()].abs().formatMoney(m_account.fraction())) );
     }
     if(dStatement) {
-      dStatement->setText(i18n("%1 deposits (%2)").tqarg(deposits[m_account.id()]).
+      dStatement->setText(i18n("%1 deposits (%2)").arg(deposits[m_account.id()]).
           arg(depositAmount[m_account.id()].abs().formatMoney(m_account.fraction())) );
     }
 
@@ -724,24 +724,24 @@ void KGlobalLedgerView::updateSummaryLine(const TQMap<TQString, MyMoneyMoney>& a
 
   if(isReconciliationAccount()) {
     if(m_account.accountType() != MyMoneyAccount::Investment) {
-      m_leftSummaryLabel->setText(i18n("Statement: %1").tqarg(d->m_endingBalance.formatMoney("", d->m_precision)));
-      m_centerSummaryLabel->setText(i18n("Cleared: %1").tqarg(clearedBalance[m_account.id()].formatMoney("", d->m_precision)));
-      m_rightSummaryLabel->setText(i18n("Difference: %1").tqarg((clearedBalance[m_account.id()] - d->m_endingBalance).formatMoney("", d->m_precision)));
+      m_leftSummaryLabel->setText(i18n("Statement: %1").arg(d->m_endingBalance.formatMoney("", d->m_precision)));
+      m_centerSummaryLabel->setText(i18n("Cleared: %1").arg(clearedBalance[m_account.id()].formatMoney("", d->m_precision)));
+      m_rightSummaryLabel->setText(i18n("Difference: %1").arg((clearedBalance[m_account.id()] - d->m_endingBalance).formatMoney("", d->m_precision)));
     }
   } else {
     // update summary line in normal mode
     TQDate reconcileDate = m_account.lastReconciliationDate();
 
     if(reconcileDate.isValid()) {
-      m_leftSummaryLabel->setText(i18n("Last reconciled: %1").tqarg(KGlobal::locale()->formatDate(reconcileDate, true)));
+      m_leftSummaryLabel->setText(i18n("Last reconciled: %1").arg(KGlobal::locale()->formatDate(reconcileDate, true)));
     } else {
       m_leftSummaryLabel->setText(i18n("Never reconciled"));
     }
 
     m_rightSummaryLabel->setPaletteForegroundColor(m_leftSummaryLabel->paletteForegroundColor());
     if(m_account.accountType() != MyMoneyAccount::Investment) {
-      m_centerSummaryLabel->setText(i18n("Cleared: %1").tqarg(clearedBalance[m_account.id()].formatMoney("", d->m_precision)));
-      m_rightSummaryLabel->setText(i18n("Balance: %1").tqarg(actBalance[m_account.id()].formatMoney("", d->m_precision)));
+      m_centerSummaryLabel->setText(i18n("Cleared: %1").arg(clearedBalance[m_account.id()].formatMoney("", d->m_precision)));
+      m_rightSummaryLabel->setText(i18n("Balance: %1").arg(actBalance[m_account.id()].formatMoney("", d->m_precision)));
       bool showNegative = actBalance[m_account.id()].isNegative();
       if(m_account.accountGroup() == MyMoneyAccount::Liability && !actBalance[m_account.id()].isZero())
         showNegative = !showNegative;
@@ -775,7 +775,7 @@ void KGlobalLedgerView::updateSummaryLine(const TQMap<TQString, MyMoneyMoney>& a
         }
         balance += ((*it_b) * rate).convert(base.smallestAccountFraction());
       }
-      m_rightSummaryLabel->setText(i18n("Investment value: %1%2").tqarg(approx ? "~" : "").tqarg(balance.formatMoney(base.tradingSymbol(), d->m_precision)));
+      m_rightSummaryLabel->setText(i18n("Investment value: %1%2").arg(approx ? "~" : "").arg(balance.formatMoney(base.tradingSymbol(), d->m_precision)));
     }
   }
 }
@@ -1149,12 +1149,12 @@ TransactionEditor* KGlobalLedgerView::startEdit(const KMyMoneyRegister::Selected
 
       // Check if the editor has some preference on where to set the focus
       // If not, set the focus to the first widget in the tab order
-      TQWidget* tqfocusWidget = editor->firstWidget();
-      if(!tqfocusWidget)
-        tqfocusWidget = m_tabOrderWidgets.first();
+      TQWidget* focusWidget = editor->firstWidget();
+      if(!focusWidget)
+        focusWidget = m_tabOrderWidgets.first();
 
       // for some reason, this only works reliably if delayed a bit
-      TQTimer::singleShot(10, tqfocusWidget, TQT_SLOT(setFocus()));
+      TQTimer::singleShot(10, focusWidget, TQT_SLOT(setFocus()));
 
       // preset to 'I have no idea which type to create' for the next round.
       d->m_action = KMyMoneyRegister::ActionNone;
@@ -1207,7 +1207,7 @@ bool KGlobalLedgerView::focusNextPrevChild(bool next)
     TQWidget *w = 0;
     TQWidget *currentWidget;
 
-    w = tqApp->tqfocusWidget();
+    w = tqApp->focusWidget();
     while(w && m_tabOrderWidgets.find(w) == -1) {
       // qDebug("'%s' not in list, use parent", w->className());
       w = w->parentWidget();