summaryrefslogtreecommitdiffstats
path: root/libkholidays/kholidays.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /libkholidays/kholidays.cpp
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkholidays/kholidays.cpp')
-rw-r--r--libkholidays/kholidays.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/libkholidays/kholidays.cpp b/libkholidays/kholidays.cpp
index 694a32dd5..686b438a0 100644
--- a/libkholidays/kholidays.cpp
+++ b/libkholidays/kholidays.cpp
@@ -90,7 +90,7 @@ TQString KHolidays::location() const
TQString KHolidays::shortText( const TQDate &date )
{
TQValueList<KHoliday> lst = getHolidays( date );
- if ( !lst.isEmpty() )
+ if ( !lst.isEmpty() )
return lst.first().text;
else return TQString::null;
}
@@ -116,7 +116,7 @@ bool KHolidays::parseFile( const TQDate &date )
TQString KHolidays::getHoliday( const TQDate &date )
{
TQValueList<KHoliday> lst = getHolidays( date );
- if ( !lst.isEmpty() )
+ if ( !lst.isEmpty() )
return lst.first().text;
else return TQString::null;
}
@@ -124,6 +124,10 @@ TQString KHolidays::getHoliday( const TQDate &date )
TQValueList<KHoliday> KHolidays::getHolidays( const TQDate &date )
{
TQValueList<KHoliday> list;
+ if ( !date.isValid() ) {
+ return list;
+ }
+
if ( !parseFile( date ) ) return list;
struct holiday *hd = &holidays[date.dayOfYear()-1];
while ( hd ) {