summaryrefslogtreecommitdiffstats
path: root/korganizer/datenavigator.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /korganizer/datenavigator.cpp
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
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
Diffstat (limited to 'korganizer/datenavigator.cpp')
-rw-r--r--korganizer/datenavigator.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index edc036ce4..e03e3c897 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();