From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 16 Feb 2011 20:17:18 +0000
Subject: Moved kpilot from kdepim to applications, as the core Trinity
 libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 korganizer/datenavigator.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'korganizer/datenavigator.cpp')

diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index edc036ce..e03e3c89 100644
--- a/korganizer/datenavigator.cpp
+++ b/korganizer/datenavigator.cpp
@@ -37,7 +37,7 @@ using namespace KCal;
 DateNavigator::DateNavigator( TQObject *parent, const char *name )
   : TQObject( parent, name )
 {
-  mSelectedDates.append( TQDate::currentDate() );
+  mSelectedDates.append( TQDate::tqcurrentDate() );
 }
 
 DateNavigator::~DateNavigator()
@@ -69,7 +69,7 @@ void DateNavigator::selectDate( const TQDate &date )
 
   if ( !d.isValid() ) {
     kdDebug(5850) << "DateNavigator::selectDates(TQDate): an invalid date was passed as a parameter!" << endl;
-    d = TQDate::currentDate();
+    d = TQDate::tqcurrentDate();
   }
 
   mSelectedDates.clear();
@@ -143,18 +143,18 @@ void DateNavigator::selectWorkWeek( const TQDate &d )
 
   int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d );
 
-  TQDate currentDate = d.addDays( weekStart - dayOfWeek );
+  TQDate tqcurrentDate = d.addDays( weekStart - dayOfWeek );
 
   if ( weekStart != 1 && dayOfWeek < weekStart ) {
-    currentDate = currentDate.addDays( -7 );
+    tqcurrentDate = tqcurrentDate.addDays( -7 );
   }
 
   mSelectedDates.clear();
-  int mask = KOGlobals::self()->getWorkWeekMask();
+  int tqmask = KOGlobals::self()->getWorkWeekMask();
 
   for ( int i = 0; i < 7; ++i ) {
-    if( (1<< ((i + weekStart + 6) % 7)) & (mask) ) {
-	mSelectedDates.append( currentDate.addDays(i) );
+    if( (1<< ((i + weekStart + 6) % 7)) & (tqmask) ) {
+	mSelectedDates.append( tqcurrentDate.addDays(i) );
     }
   }
 
@@ -163,7 +163,7 @@ void DateNavigator::selectWorkWeek( const TQDate &d )
 
 void DateNavigator::selectToday()
 {
-  TQDate d = TQDate::currentDate();
+  TQDate d = TQDate::tqcurrentDate();
 
   int dateCount = mSelectedDates.count();
 
-- 
cgit v1.2.3