summaryrefslogtreecommitdiffstats
path: root/korganizer/koglobals.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/koglobals.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/koglobals.cpp')
-rw-r--r--korganizer/koglobals.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index dd55bd374..814ea178e 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -158,9 +158,9 @@ TQStringList KOGlobals::holiday( const TQDate &date )
bool KOGlobals::isWorkDay( const TQDate &date )
{
- int mask( ~( KOPrefs::instance()->mWorkWeekMask ) );
+ int tqmask( ~( KOPrefs::instance()->mWorkWeekMask ) );
- bool nonWorkDay = ( mask & ( 1 << ( date.dayOfWeek() - 1 ) ) );
+ bool nonWorkDay = ( tqmask & ( 1 << ( date.dayOfWeek() - 1 ) ) );
if ( KOPrefs::instance()->mExcludeHolidays && mHolidays ) {
TQValueList<KHoliday> list = mHolidays->getHolidays( date );
TQValueList<KHoliday>::ConstIterator it = list.begin();