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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 3b66617d9d5f343c30a87381720db2fc835ce52b)

6 files changed, 11 insertions, 11 deletions

diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index f8a4e4ad..128ebd68 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -1558,7 +1558,7 @@ TQPair<ResourceCalendar *, TQString> ActionManager::viewSubResourceCalendar()
     cV = mCalendarView->viewManager()->multiAgendaView()->selectedAgendaView();
   }
   if ( cV ) {
-    p = tqMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
+    p = qMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
   }
   return p;
 }
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 28a128a0..8e2e1b70 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -357,7 +357,7 @@ TQPair<ResourceCalendar *, TQString> CalendarView::viewSubResourceCalendar()
     cV = mViewManager->multiAgendaView()->selectedAgendaView();
   }
   if ( cV ) {
-    p = tqMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
+    p = qMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
   }
   return p;
 }
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index bb965ba2..b2b8e8a0 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -332,7 +332,7 @@ TQPair<TQDate,TQDate> DateNavigatorContainer::dateLimits( int offset )
   TQPair<TQDate,TQDate> firstMonthBoundary = KODayMatrix::matrixLimits( firstMonth );
   TQPair<TQDate,TQDate> lastMonthBoundary = KODayMatrix::matrixLimits( lastMonth );
 
-  return tqMakePair( firstMonthBoundary.first, lastMonthBoundary.second );
+  return qMakePair( firstMonthBoundary.first, lastMonthBoundary.second );
 }
 
 #include "datenavigatorcontainer.moc"
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 87239801..18a1c2ad 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -274,7 +274,7 @@ void KOAgenda::init()
   mClickedItem = 0;
 
   mActionItem = 0;
-  mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+  mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
   mActionType = NOP;
   mItemMoved = false;
 
@@ -623,7 +623,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
             Incidence *incidence = item->incidence();
             if ( incidence->isReadOnly() ) {
               mActionItem = 0;
-              mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+              mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
             } else {
               mActionItem = item;
               mResPair = CalHelper::incSubResourceCalendar( mCalendar, incidence );
@@ -657,7 +657,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
           if ( !ptInSelection( gpos ) ) {
             selectItem(0);
             mActionItem = 0;
-            mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+            mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
             setCursor(arrowCursor);
             startSelectAction(viewportPos);
           }
@@ -918,7 +918,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos)
       emit startDragSignal( mActionItem->incidence() );
       setCursor( arrowCursor );
       mActionItem = 0;
-      mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+      mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
       mActionType = NOP;
       mItemMoved = false;
       return;
@@ -952,7 +952,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos)
         placeSubCells( mActionItem );
         setCursor( arrowCursor );
         mActionItem = 0;
-        mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+        mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
         mActionType = NOP;
         mItemMoved = false;
         return;
@@ -1192,7 +1192,7 @@ void KOAgenda::endItemAction()
   }
 
   mActionItem = 0;
-  mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+  mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
   mItemMoved = false;
 
   if ( multiModify ) {
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 5d95b81e..d78bb43e 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -725,5 +725,5 @@ TQPair<TQDate,TQDate> KODayMatrix::matrixLimits( const TQDate &month )
     d = d.addDays( -7 ); // Start on the second line
   }
 
-  return tqMakePair( d, d.addDays( NUMDAYS-1 ) );
+  return qMakePair( d, d.addDays( NUMDAYS-1 ) );
 }
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index dbae5ceb..b919602e 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1065,7 +1065,7 @@ void KOTodoView::itemStateChanged( TQListViewItem *item )
 
 void KOTodoView::setNewPercentageDelayed( KOTodoViewItem *item, int percentage )
 {
-  mPercentChangedMap.append( tqMakePair( item, percentage ) );
+  mPercentChangedMap.append( qMakePair( item, percentage ) );
 
   TQTimer::singleShot( 0, this, TQT_SLOT( processDelayedNewPercentage() ) );
 }