Replaced various '#define' with actual strings - part 3

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

kmymoney2/kmymoney2.cpp

@@ -3242,7 +3242,7 @@ void KMyMoney2App::slotAccountReconcileFinish(void)
         file->modifyTransaction(t);
 
         // ... and the list
-        (*it) = tqMakePair(t, sp);
+        (*it) = qMakePair(t, sp);
       }
       ft.commit();
 

kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp

@@ -790,7 +790,7 @@ void MyMoneyDatabaseMgr::transactionList(TQValueList<TQPair<MyMoneyTransaction,
     if(filter.match(*it_t)) {
       TQValueList<MyMoneySplit>::const_iterator it_s;
       for(it_s = filter.matchingSplits().begin(); it_s != filter.matchingSplits().end(); ++it_s) {
-        list.append(tqMakePair(*it_t, *it_s));
+        list.append(qMakePair(*it_t, *it_s));
       }
     }
   }

kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp

@@ -803,7 +803,7 @@ void MyMoneySeqAccessMgr::transactionList(TQValueList< TQPair<MyMoneyTransaction
     if(filter.match(*it_t)) {
       TQValueList<MyMoneySplit>::const_iterator it_s;
       for(it_s = filter.matchingSplits().begin(); it_s != filter.matchingSplits().end(); ++it_s) {
-        list.append(tqMakePair(*it_t, *it_s));
+        list.append(qMakePair(*it_t, *it_s));
       }
     }
   }

kmymoney2/widgets/kmymoneyaccounttreebase.cpp

@@ -518,7 +518,7 @@ void KMyMoneyAccountTreeBase::viewportPaintEvent(TQPaintEvent* e)
     TQPainter painter(viewport());
 
     // This is where we actually draw the drop-highlighter
-    style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_lastDropHighlighter, colorGroup(),
+    style().drawPrimitive(TQStyle::PE_FocusRect, &painter, m_lastDropHighlighter, colorGroup(),
                           TQStyle::Style_FocusAtBorder);
   }
 }

kmymoney2/widgets/kmymoneycalendar.cpp

@@ -214,7 +214,7 @@ kMyMoneyCalendar::resizeEvent(TQResizeEvent*)
     // ----- calculate size of the month button:
     for(count=0; count<NoOfButtons; ++count) {
   if(buttons[count]==selectMonth) {
-      TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect);
+      TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect);
       sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::style().pixelMetric(TQStyle::PM_ButtonMargin)));
   }
     }
@@ -502,7 +502,7 @@ kMyMoneyCalendar::sizeHint() const
 
       if(buttons[count]==selectMonth)
   {
-    TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect);
+    TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect);
     cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::style().pixelMetric(TQStyle::PM_ButtonMargin));
   } else {
     cx+=sizes[count].width();

kmymoney2/widgets/register.cpp

@@ -1889,7 +1889,7 @@ TQWidget* Register::cellWidget(int row, int col) const
     return 0;
 
   TQWidget* w = 0;
-  TQPair<int, int> idx = tqMakePair(row, col);
+  TQPair<int, int> idx = qMakePair(row, col);
   TQMap<TQPair<int, int>, TQWidget*>::const_iterator it_w;
 
   it_w = m_cellWidgets.find(idx);
@@ -1905,7 +1905,7 @@ void Register::insertWidget(int row, int col, TQWidget* w)
     return;
   }
 
-  TQPair<int, int> idx = tqMakePair(row, col);
+  TQPair<int, int> idx = qMakePair(row, col);
   m_cellWidgets[idx] = w;
 }
 
@@ -1916,7 +1916,7 @@ void Register::clearCellWidget(int row, int col)
     return;
   }
 
-  TQPair<int, int> idx = tqMakePair(row, col);
+  TQPair<int, int> idx = qMakePair(row, col);
   TQMap<TQPair<int, int>, TQWidget*>::iterator it_w;
 
   it_w = m_cellWidgets.find(idx);