1 files changed, 21 insertions, 21 deletions

diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp
index 6fa22ee..ef07db6 100644
--- a/kmymoney2/views/kpayeesview.cpp
+++ b/kmymoney2/views/kpayeesview.cpp
@@ -29,7 +29,7 @@
 #include <tqcombobox.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmultilineedit.h>
 #include <tqpixmap.h>
 #include <tqtabwidget.h>
@@ -298,11 +298,11 @@ KTransactionListItem::~KTransactionListItem()
 {
 }
 
-void KTransactionListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void KTransactionListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
 {
   TQColorGroup _cg = cg;
   _cg.setColor(TQColorGroup::Base, backgroundColor());
-  TQListViewItem::paintCell(p, _cg, column, width, tqalignment);
+  TQListViewItem::paintCell(p, _cg, column, width, alignment);
 }
 
 const TQColor KTransactionListItem::backgroundColor(void)
@@ -323,9 +323,9 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) :
   m_inSelection(false)
 {
   // create the searchline widget
-  // and insert it into the existing tqlayout
+  // and insert it into the existing layout
   m_searchWidget = new KListViewSearchLineWidget(m_payeesList, this);
-  m_searchWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+  m_searchWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
   KPayeesViewDeclLayout->insertWidget(0, m_searchWidget);
 
   m_splitter = new TQSplitter(this);
@@ -333,7 +333,7 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) :
   m_tabWidget->reparent(m_splitter, TQPoint(0, 0), true);
   m_splitter->setResizeMode(m_tabWidget, TQSplitter::Stretch);
   m_splitter->setOpaqueResize();
-  tqlayout10->addWidget(m_splitter);
+  layout10->addWidget(m_splitter);
 
   // use the size settings of the last run (if any)
   KConfig *config = KGlobal::config();
@@ -495,7 +495,7 @@ void KPayeesView::slotRenamePayee(TQListViewItem* p , int /* col */, const TQStr
         if (KMessageBox::questionYesNo(this,
           i18n("A payee with the name '%1' already exists. It is not advisable to have "
             "multiple payees with the same identification name. Are you sure you would like "
-            "to rename the payee?").tqarg(new_name)) != KMessageBox::Yes)
+            "to rename the payee?").arg(new_name)) != KMessageBox::Yes)
         {
           p->setText(0,m_payee.name());
           return;
@@ -521,7 +521,7 @@ void KPayeesView::slotRenamePayee(TQListViewItem* p , int /* col */, const TQStr
 
     } catch(MyMoneyException *e) {
       KMessageBox::detailedSorry(0, i18n("Unable to modify payee"),
-        (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line()));
+        (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line()));
       delete e;
     }
   }
@@ -565,8 +565,8 @@ void KPayeesView::slotSelectPayee(void)
   // check if the content of a currently selected payee was modified
   // and ask to store the data
   if (m_updateButton->isEnabled()) {
-    if (KMessageBox::questionYesNo(this, TQString("<qt>%1</qt>").tqarg(
-          i18n("Do you want to save the changes for <b>%1</b>?").tqarg(m_newName)),
+    if (KMessageBox::questionYesNo(this, TQString("<qt>%1</qt>").arg(
+          i18n("Do you want to save the changes for <b>%1</b>?").arg(m_newName)),
           i18n("Save changes")) == KMessageBox::Yes) {
       m_inSelection = true;
       slotUpdatePayee();
@@ -664,7 +664,7 @@ void KPayeesView::showTransactions(void)
   m_transactionView->clear();
 
   if(m_payee.id().isEmpty() || !m_tabWidget->isEnabled()) {
-    m_balanceLabel->setText(i18n("Balance: %1").tqarg(balance.formatMoney(MyMoneyFile::instance()->baseCurrency().smallestAccountFraction())));
+    m_balanceLabel->setText(i18n("Balance: %1").arg(balance.formatMoney(MyMoneyFile::instance()->baseCurrency().smallestAccountFraction())));
     return;
   }
 
@@ -727,24 +727,24 @@ void KPayeesView::showTransactions(void)
     if(s.action() == MyMoneySplit::ActionAmortization) {
       if(acc.accountType() == MyMoneyAccount::Loan) {
         if(s.value().isPositive()) {
-          txt = i18n("Amortization of %1").tqarg(acc.name());
+          txt = i18n("Amortization of %1").arg(acc.name());
         } else {
-          txt = i18n("Payment to %1").tqarg(acc.name());
+          txt = i18n("Payment to %1").arg(acc.name());
         }
       } else if(acc.accountType() == MyMoneyAccount::AssetLoan) {
         if(s.value().isNegative()) {
-          txt = i18n("Amortization of %1").tqarg(acc.name());
+          txt = i18n("Amortization of %1").arg(acc.name());
         } else {
-          txt = i18n("Payment to %1").tqarg(acc.name());
+          txt = i18n("Payment to %1").arg(acc.name());
         }
       } else {
-        txt = i18n("Loan payment from %1").tqarg(acc.name());
+        txt = i18n("Loan payment from %1").arg(acc.name());
       }
     } else if (file->isTransfer(*t)) {
       if(!s.value().isNegative()) {
-        txt = i18n("Transfer to %1").tqarg(acc.name());
+        txt = i18n("Transfer to %1").arg(acc.name());
       } else {
-        txt = i18n("Transfer from %1").tqarg(acc.name());
+        txt = i18n("Transfer from %1").arg(acc.name());
       }
     } else if(t->splitCount() > 2) {
       txt = i18n("Split transaction (category replacement)", "Split transaction");
@@ -755,7 +755,7 @@ void KPayeesView::showTransactions(void)
     item->setText(2, txt);
     item->setText(3, s.value().formatMoney(acc.fraction()));
   }
-  m_balanceLabel->setText(i18n("Balance: %1").tqarg(balance.formatMoney(MyMoneyFile::instance()->baseCurrency().smallestAccountFraction())));
+  m_balanceLabel->setText(i18n("Balance: %1").arg(balance.formatMoney(MyMoneyFile::instance()->baseCurrency().smallestAccountFraction())));
 
   // Trick: it seems, that the initial sizing of the view does
   // not work correctly. At least, the columns do not get displayed
@@ -872,7 +872,7 @@ void KPayeesView::slotUpdatePayee(void)
 
     } catch(MyMoneyException *e) {
       KMessageBox::detailedSorry(0, i18n("Unable to modify payee"),
-        (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line()));
+        (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line()));
       delete e;
     }
   }
@@ -913,7 +913,7 @@ void KPayeesView::show(void)
     m_needReload = false;
   }
 
-  // fixup the tqlayout
+  // fixup the layout
   TQTimer::singleShot(0, this, TQT_SLOT(rearrange()));
 
   // don't forget base class implementation