[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kholidays] /: KF5: Remove date() api
From:       John Layt <jlayt () kde ! org>
Date:       2015-09-02 18:07:26
Message-ID: E1ZXCRS-0003LI-6k () scm ! kde ! org
[Download RAW message or body]

Git commit 2249708dc24441423dacfaa3581727bc25ff4451 by John Layt.
Committed on 02/09/2015 at 17:53.
Pushed by jlayt into branch 'master'.

KF5: Remove date() api

Remove the date() call as observedStartDate() and observedEndDate()
should be used instead.

M  +1    -1    autotests/testholidayregion.cpp
M  +0    -5    src/holiday.cpp
M  +0    -5    src/holiday.h
M  +1    -1    src/parsers/plan2/holidayparserdriverplan.cpp

http://commits.kde.org/kholidays/2249708dc24441423dacfaa3581727bc25ff4451

diff --git a/autotests/testholidayregion.cpp b/autotests/testholidayregion.cpp
index dca6295..27df7eb 100644
--- a/autotests/testholidayregion.cpp
+++ b/autotests/testholidayregion.cpp
@@ -49,7 +49,7 @@ void HolidayRegionTest::printHolidays( KHolidays::Holiday::List \
holidays )  {
     if ( holidays.count() > 0 ) {
         foreach ( const KHolidays::Holiday &holiday, holidays ) {
-            qDebug() << "Date = " << holiday.date().toString( Qt::ISODate ) << " \
Duration = " << holiday.duration() << " Name = " << holiday.name(); +            \
qDebug() << "Date = " << holiday.observedStartDate().toString( Qt::ISODate ) << " \
Duration = " << holiday.duration() << " Name = " << holiday.name();  }
     } else {
         qDebug() << "No holidays";
diff --git a/src/holiday.cpp b/src/holiday.cpp
index 8c86d1c..35f2de5 100644
--- a/src/holiday.cpp
+++ b/src/holiday.cpp
@@ -64,11 +64,6 @@ bool Holiday::operator>( const Holiday &rhs ) const
   return d->mObservedDate > rhs.d->mObservedDate;
 }
 
-QDate Holiday::date() const
-{
-  return d->mObservedDate;
-}
-
 QDate Holiday::observedStartDate() const
 {
   return d->mObservedDate;
diff --git a/src/holiday.h b/src/holiday.h
index 8ad1e0f..5b4e72a 100644
--- a/src/holiday.h
+++ b/src/holiday.h
@@ -89,11 +89,6 @@ class KHOLIDAYS_EXPORT Holiday
     bool operator>( const Holiday &rhs ) const;
 
     /**
-     * Returns the observed date of the holiday.
-     */
-    QDate date() const;
-
-    /**
      * @since 4.6
      *
      * Returns the observed start date of the holiday.
diff --git a/src/parsers/plan2/holidayparserdriverplan.cpp \
b/src/parsers/plan2/holidayparserdriverplan.cpp index c200da5..54249bd 100644
--- a/src/parsers/plan2/holidayparserdriverplan.cpp
+++ b/src/parsers/plan2/holidayparserdriverplan.cpp
@@ -304,7 +304,7 @@ int HolidayParserDriverPlan::julianDayFromEventName( const \
QString &eventName )  {
     foreach ( const KHolidays::Holiday &thisHoliday, m_resultList ) {
         if ( thisHoliday.name() == eventName ) {
-            return thisHoliday.date().toJulianDay();
+            return thisHoliday.observedStartDate().toJulianDay();
         }
     }
     return -1;


[prev in list] [next in list] [prev in thread] [next in thread]