[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kholidays] /: KF5: Remove multiday mode
From: John Layt <jlayt () kde ! org>
Date: 2015-09-02 18:07:25
Message-ID: E1ZXCRR-0003LI-4E () scm ! kde ! org
[Download RAW message or body]
Git commit 7129f322f7e41c40cea7d915366de76234877ba2 by John Layt.
Committed on 02/09/2015 at 17:53.
Pushed by jlayt into branch 'master'.
KF5: Remove multiday mode
Remove the multiday mode and default instead to single event to be
consistent with iCalendar style api's.
M +7 -8 autotests/testholidayregion.cpp
M +3 -6 autotests/testholidayregion.h
M +0 -8 src/holiday.h
M +7 -9 src/holidayregion.cpp
M +3 -4 src/holidayregion.h
M +5 -9 src/parsers/holidayparserdriver.cpp
M +3 -10 src/parsers/holidayparserdriver_p.h
M +1 -8 src/parsers/plan2/holidayparserdriverplan.cpp
http://commits.kde.org/kholidays/7129f322f7e41c40cea7d915366de76234877ba2
diff --git a/autotests/testholidayregion.cpp b/autotests/testholidayregion.cpp
index 91d83e0..6a8ea44 100644
--- a/autotests/testholidayregion.cpp
+++ b/autotests/testholidayregion.cpp
@@ -57,28 +57,27 @@ void HolidayRegionTest::printHolidays( KHolidays::Holiday::List \
holidays ) }
void HolidayRegionTest::parseRegionCalendarYear( const KHolidays::HolidayRegion \
®ion, int year,
- const QString &calendarType, \
KHolidays::Holiday::MultidayMode multidayMode ) + \
const QString &calendarType ) {
qDebug() << "Parsing region = " << region.regionCode() << " year = " << year << \
" calendar = " << calendarType;
- printHolidays( region.holidays( year, calendarType, multidayMode ) );
+ printHolidays( region.holidays( year, calendarType ) );
qDebug() << "";
}
void HolidayRegionTest::parseRegionDateRange( const KHolidays::HolidayRegion \
®ion, const QDate &startDate,
- const QDate &endDate, \
KHolidays::Holiday::MultidayMode multidayMode ) + \
const QDate &endDate ) {
qDebug() << "Parsing regionCode = " << region.regionCode()
<< " start date = " << startDate.toString( Qt::ISODate )
<< " end date = " << endDate.toString( Qt::ISODate );
- printHolidays( region.holidays( startDate, endDate, multidayMode ) );
+ printHolidays( region.holidays( startDate, endDate ) );
qDebug() << "";
}
-void HolidayRegionTest::parseRegionDate( const KHolidays::HolidayRegion ®ion, \
const QDate &date,
- KHolidays::Holiday::MultidayMode \
multidayMode ) +void HolidayRegionTest::parseRegionDate( const \
KHolidays::HolidayRegion ®ion, const QDate &date ) {
qDebug() << "Parsing regionCode = " << region.regionCode() << " date = " << \
date.toString( Qt::ISODate );
- printHolidays( region.holidays( date, multidayMode ) );
+ printHolidays( region.holidays( date ) );
qDebug() << "";
}
@@ -86,7 +85,7 @@ void HolidayRegionTest::testLoadFile()
{
KHolidays::HolidayRegion region( QFileInfo( KDESRCDIR \
"/holiday_gb-eaw_en-gb_Test" ) ); printMetadata( region );
- parseRegionCalendarYear( region, 2010, "gregorian", \
KHolidays::Holiday::MultidayHolidaysAsSingleEvents ); + parseRegionCalendarYear( \
region, 2010, "gregorian" ); parseRegionCalendarYear( region, 2010 );
parseRegionCalendarYear( region, 2011 );
parseRegionCalendarYear( region, 2012 );
diff --git a/autotests/testholidayregion.h b/autotests/testholidayregion.h
index a6b9972..64404c4 100644
--- a/autotests/testholidayregion.h
+++ b/autotests/testholidayregion.h
@@ -44,12 +44,9 @@ private:
void printMetadata( const KHolidays::HolidayRegion ®ion );
void printHolidays( KHolidays::Holiday::List holidays );
void parseRegionCalendarYear( const KHolidays::HolidayRegion ®ion, int year,
- const QString &calendarType = "gregorian",
- KHolidays::Holiday::MultidayMode multidayMode = \
KHolidays::Holiday::MultidayHolidaysAsMultipleEvents );
- void parseRegionDateRange( const KHolidays::HolidayRegion ®ion, const QDate \
&startDate, const QDate &endDate,
- KHolidays::Holiday::MultidayMode multidayMode = \
KHolidays::Holiday::MultidayHolidaysAsMultipleEvents );
- void parseRegionDate( const KHolidays::HolidayRegion ®ion, const QDate &date,
- KHolidays::Holiday::MultidayMode multidayMode = \
KHolidays::Holiday::MultidayHolidaysAsMultipleEvents ); + \
const QString &calendarType = "gregorian" ); + void parseRegionDateRange( const \
KHolidays::HolidayRegion ®ion, const QDate &startDate, const QDate &endDate ); + \
void parseRegionDate( const KHolidays::HolidayRegion ®ion, const QDate &date ); \
};
#endif // TESTHOLIDAYREGION_H
diff --git a/src/holiday.h b/src/holiday.h
index 333cab8..bdfe488 100644
--- a/src/holiday.h
+++ b/src/holiday.h
@@ -59,14 +59,6 @@ class KHOLIDAYS_EXPORT Holiday
};
/**
- * Describes how to return Multiday holidays
- */
- enum MultidayMode {
- MultidayHolidaysAsMultipleEvents, ///< Return Holiday instance for each day \
with duration = 1
- MultidayHolidaysAsSingleEvents ///< Return a single Holiday instance with \
duration set
- };
-
- /**
* Creates an empty holiday.
*/
Holiday();
diff --git a/src/holidayregion.cpp b/src/holidayregion.cpp
index d749479..c98bb43 100644
--- a/src/holidayregion.cpp
+++ b/src/holidayregion.cpp
@@ -338,30 +338,28 @@ bool HolidayRegion::isValid( const QString ®ionCode )
return temp.isValid();
}
-Holiday::List HolidayRegion::holidays( const QDate &startDate, const QDate &endDate,
- Holiday::MultidayMode multidayMode ) const
+Holiday::List HolidayRegion::holidays( const QDate &startDate, const QDate &endDate \
) const {
if ( isValid() ) {
- return d->mDriver->parseHolidays( startDate, endDate, multidayMode );
+ return d->mDriver->parseHolidays( startDate, endDate );
} else {
return Holiday::List();
}
}
-Holiday::List HolidayRegion::holidays( const QDate &date, Holiday::MultidayMode \
multidayMode ) const +Holiday::List HolidayRegion::holidays( const QDate &date ) \
const {
if ( isValid() ) {
- return d->mDriver->parseHolidays( date, multidayMode );
+ return d->mDriver->parseHolidays( date );
} else {
return Holiday::List();
}
}
-Holiday::List HolidayRegion::holidays( int calendarYear, const QString \
&calendarType,
- Holiday::MultidayMode multidayMode ) const
+Holiday::List HolidayRegion::holidays( int calendarYear, const QString &calendarType \
) const {
if ( isValid() ) {
- return d->mDriver->parseHolidays( calendarYear, calendarType, multidayMode );
+ return d->mDriver->parseHolidays( calendarYear, calendarType );
} else {
return Holiday::List();
}
@@ -369,7 +367,7 @@ Holiday::List HolidayRegion::holidays( int calendarYear, const \
QString &calendar
bool HolidayRegion::isHoliday( const QDate &date ) const
{
- Holiday::List holidayList = holidays( date, \
Holiday::MultidayHolidaysAsMultipleEvents ); + Holiday::List holidayList = holidays( \
date ); if ( holidayList.count() > 0 ) {
foreach ( const KHolidays::Holiday &holiday, holidayList ) {
if ( holiday.dayType() == Holiday::NonWorkday ) {
diff --git a/src/holidayregion.h b/src/holidayregion.h
index fbbce93..ba0c64b 100644
--- a/src/holidayregion.h
+++ b/src/holidayregion.h
@@ -200,22 +200,21 @@ class KHOLIDAYS_EXPORT HolidayRegion
*
* Returns the list of holidays that occur between @p startDate and @p endDate.
*/
- Holiday::List holidays( const QDate &startDate, const QDate &endDate, \
Holiday::MultidayMode multidayMode = Holiday::MultidayHolidaysAsMultipleEvents ) \
const; + Holiday::List holidays( const QDate &startDate, const QDate &endDate ) \
const;
/**
* @since 4.6
*
* Returns the list of holidays that occur on a @p date.
*/
- Holiday::List holidays( const QDate &date, Holiday::MultidayMode multidayMode = \
Holiday::MultidayHolidaysAsMultipleEvents ) const; + Holiday::List holidays( const \
QDate &date ) const;
/**
* @since 4.6
*
* Returns the list of holidays that occur in a calendar year @p calendarYear.
*/
- Holiday::List holidays( int calendarYear, const QString &calendarType,
- Holiday::MultidayMode multidayMode = \
Holiday::MultidayHolidaysAsMultipleEvents) const; + Holiday::List holidays( int \
calendarYear, const QString &calendarType ) const;
/**
* Checks whether there is any holiday defined for a @p date.
diff --git a/src/parsers/holidayparserdriver.cpp \
b/src/parsers/holidayparserdriver.cpp index 32bfa54..a94b15a 100644
--- a/src/parsers/holidayparserdriver.cpp
+++ b/src/parsers/holidayparserdriver.cpp
@@ -57,10 +57,8 @@ QString HolidayParserDriver::fileDescription() const
return m_fileDescription;
}
-Holiday::List HolidayParserDriver::parseHolidays( const QDate &startDate, const \
QDate &endDate,
- Holiday::MultidayMode multidayMode \
) +Holiday::List HolidayParserDriver::parseHolidays( const QDate &startDate, const \
QDate &endDate ) {
- m_multidayMode = multidayMode;
m_resultList.clear();
if ( startDate.isNull() || endDate.isNull() ) {
return m_resultList;
@@ -72,14 +70,12 @@ Holiday::List HolidayParserDriver::parseHolidays( const QDate \
&startDate, const return m_resultList;
}
-Holiday::List HolidayParserDriver::parseHolidays( const QDate &requestDate,
- Holiday::MultidayMode multidayMode \
) +Holiday::List HolidayParserDriver::parseHolidays( const QDate &requestDate )
{
- return parseHolidays( requestDate, requestDate, multidayMode );
+ return parseHolidays( requestDate, requestDate );
}
-Holiday::List HolidayParserDriver::parseHolidays( int calendarYear, const QString \
&calendarType,
- Holiday::MultidayMode multidayMode \
) +Holiday::List HolidayParserDriver::parseHolidays( int calendarYear, const QString \
&calendarType ) {
m_resultList.clear();
setParseCalendar( calendarType );
@@ -91,7 +87,7 @@ Holiday::List HolidayParserDriver::parseHolidays( int calendarYear, \
const QStrin m_parseCalendar->setDate( startDate, calendarYear, 1, 1 );
endDate = startDate.addDays( m_parseCalendar->daysInYear( startDate ) - 1 );
- return parseHolidays( startDate, endDate, multidayMode );
+ return parseHolidays( startDate, endDate );
}
void HolidayParserDriver::error( const QString &errorMessage )
diff --git a/src/parsers/holidayparserdriver_p.h \
b/src/parsers/holidayparserdriver_p.h index ba0cf38..f0017d2 100644
--- a/src/parsers/holidayparserdriver_p.h
+++ b/src/parsers/holidayparserdriver_p.h
@@ -97,23 +97,20 @@ class HolidayParserDriver
*
* @param startDate start date of the holiday parse range
* @param endDate end date of the holiday parse range
- * @param multidayMode how to return multiday holidays
*
* @return a list of holidays
*/
- virtual Holiday::List parseHolidays( const QDate &startDate, const QDate \
&endDate,
- Holiday::MultidayMode multidayMode );
+ virtual Holiday::List parseHolidays( const QDate &startDate, const QDate \
&endDate );
/**
* Convenience function
* Return a list of holidays falling on a given date
*
* @param date date to return holidays for
- * @param multidayMode how to return multiday holidays
*
* @return a list of holidays
*/
- virtual Holiday::List parseHolidays( const QDate &date, Holiday::MultidayMode \
multidayMode ); + virtual Holiday::List parseHolidays( const QDate &date );
/**
* Convenience function
@@ -122,12 +119,10 @@ class HolidayParserDriver
* @param calendarYear year to return holidays for
* @param calendarType calendar system of year, standard KDE calendar type,
* see KCalendarSystem
- * @param multidayMode how to return multiday holidays
*
* @return a list of holidays
*/
- virtual Holiday::List parseHolidays( int calendarYear, const QString \
&calendarType,
- Holiday::MultidayMode multidayMode );
+ virtual Holiday::List parseHolidays( int calendarYear, const QString \
&calendarType );
/**
* Standard error message handling
@@ -175,8 +170,6 @@ class HolidayParserDriver
int m_parseYear; // Year currently being parsed
int m_parseStartYear; // First year to parse in parse calendar
int m_parseEndYear; // Last year to parse in parse calendar
-
- Holiday::MultidayMode m_multidayMode; // How to return multiday holidays
};
}
diff --git a/src/parsers/plan2/holidayparserdriverplan.cpp \
b/src/parsers/plan2/holidayparserdriverplan.cpp index 244e9b9..79c1dd0 100644
--- a/src/parsers/plan2/holidayparserdriverplan.cpp
+++ b/src/parsers/plan2/holidayparserdriverplan.cpp
@@ -684,14 +684,7 @@ void HolidayParserDriverPlan::setEvent( int jd, int \
observeOffset, int duration // Date the holiday will be observed on
int observeJd = jd + observeOffset;
- if ( m_multidayMode == Holiday::MultidayHolidaysAsSingleEvents ) {
- addHoliday( QDate::fromJulianDay( observeJd ), duration );
- } else { // KHolidays::MultidayHolidaysAsMultipleEvents
- // Create backwards compatible holidays, one incidence per day
- for ( int dd = 0; dd < duration; ++dd ) {
- addHoliday( QDate::fromJulianDay( observeJd + dd ), 1 );
- }
- }
+ addHoliday( QDate::fromJulianDay( observeJd ), duration );
}
void HolidayParserDriverPlan::addHoliday( const QDate &observedDate, int duration )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic